mirror of
https://github.com/yurisieucuti/treble_evolution.git
synced 2024-11-24 08:36:19 +00:00
83 lines
3.6 KiB
Diff
83 lines
3.6 KiB
Diff
From 43a11656f6f70e3a3c3037bd91e535120780f309 Mon Sep 17 00:00:00 2001
|
|
From: Alberto Ponces <ponces26@gmail.com>
|
|
Date: Fri, 20 Oct 2023 09:26:19 +0000
|
|
Subject: [PATCH 42/51] Revert "Removed IWLAN legacy mode support"
|
|
|
|
This reverts commit 2832dee607ab33eee688abea206f4adfcfc896f1.
|
|
---
|
|
.../java/android/telephony/ServiceState.java | 30 ++++++++++++-------
|
|
1 file changed, 20 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
|
|
index 85a85c6dfadb..6c96ac4bc712 100644
|
|
--- a/telephony/java/android/telephony/ServiceState.java
|
|
+++ b/telephony/java/android/telephony/ServiceState.java
|
|
@@ -1215,8 +1215,13 @@ public class ServiceState implements Parcelable {
|
|
|
|
/**
|
|
* Initialize the service state. Set everything to the default value.
|
|
+ *
|
|
+ * @param legacyMode {@code true} if the device is on IWLAN legacy mode, where IWLAN is
|
|
+ * considered as a RAT on WWAN {@link NetworkRegistrationInfo}. {@code false} if the device
|
|
+ * is on AP-assisted mode, where IWLAN should be reported through WLAN.
|
|
+ * {@link NetworkRegistrationInfo}.
|
|
*/
|
|
- private void init() {
|
|
+ private void init(boolean legacyMode) {
|
|
if (DBG) Rlog.d(LOG_TAG, "init");
|
|
mVoiceRegState = STATE_OUT_OF_SERVICE;
|
|
mDataRegState = STATE_OUT_OF_SERVICE;
|
|
@@ -1248,11 +1253,13 @@ public class ServiceState implements Parcelable {
|
|
.setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
|
|
.setRegistrationState(NetworkRegistrationInfo.REGISTRATION_STATE_UNKNOWN)
|
|
.build());
|
|
- addNetworkRegistrationInfo(new NetworkRegistrationInfo.Builder()
|
|
- .setDomain(NetworkRegistrationInfo.DOMAIN_PS)
|
|
- .setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WLAN)
|
|
- .setRegistrationState(NetworkRegistrationInfo.REGISTRATION_STATE_UNKNOWN)
|
|
- .build());
|
|
+ if (!legacyMode) {
|
|
+ addNetworkRegistrationInfo(new NetworkRegistrationInfo.Builder()
|
|
+ .setDomain(NetworkRegistrationInfo.DOMAIN_PS)
|
|
+ .setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WLAN)
|
|
+ .setRegistrationState(NetworkRegistrationInfo.REGISTRATION_STATE_UNKNOWN)
|
|
+ .build());
|
|
+ }
|
|
}
|
|
mOperatorAlphaLongRaw = null;
|
|
mOperatorAlphaShortRaw = null;
|
|
@@ -1261,11 +1268,11 @@ public class ServiceState implements Parcelable {
|
|
}
|
|
|
|
public void setStateOutOfService() {
|
|
- init();
|
|
+ init(true);
|
|
}
|
|
|
|
public void setStateOff() {
|
|
- init();
|
|
+ init(true);
|
|
mVoiceRegState = STATE_POWER_OFF;
|
|
mDataRegState = STATE_POWER_OFF;
|
|
}
|
|
@@ -1273,11 +1280,14 @@ public class ServiceState implements Parcelable {
|
|
/**
|
|
* Set the service state to out-of-service
|
|
*
|
|
+ * @param legacyMode {@code true} if the device is on IWLAN legacy mode, where IWLAN is
|
|
+ * considered as a RAT on WWAN {@link NetworkRegistrationInfo}. {@code false} if the device
|
|
+ * is on AP-assisted mode, where IWLAN should be reported through WLAN.
|
|
* @param powerOff {@code true} if this is a power off case (i.e. Airplane mode on).
|
|
* @hide
|
|
*/
|
|
- public void setOutOfService(boolean powerOff) {
|
|
- init();
|
|
+ public void setOutOfService(boolean legacyMode, boolean powerOff) {
|
|
+ init(legacyMode);
|
|
if (powerOff) {
|
|
mVoiceRegState = STATE_POWER_OFF;
|
|
mDataRegState = STATE_POWER_OFF;
|
|
--
|
|
2.25.1
|
|
|