From f8c6f3483215b7a9401cb384980ccdb459f7261b Mon Sep 17 00:00:00 2001 From: Mattias Nilsson Date: Fri, 24 Jan 2020 17:49:49 +0100 Subject: [PATCH 1/2] Move config_inflateSignalStrength to CC Sim based customizations should not be resources because of two reasons: 1. The MCC/MNC value in AssetManager for Dual sim devices is undefined 2. There is no support for MVNOs. For dual sim devices there is only one value for MCC/MNC in AssetManager and that value is updated from multiple places without deciding if it should be the default voice sim card, the default data sim card or whatnot. This means that when frameworks is trying to decide what resource to use there is no guarantee that the resource that arrives is for the particular subscription we are asking for. MVNOs cannot be separated through only MCC/MNC but need more parameters like service provider, imsi, GID1 etc. MVNO support is available in CarrierConfig. When we now have support for ADCP updates of customizations and start using carrier id this is better placed in CarrierConfig, we then get support for MVNOs at the same time. Bug: 148483577 Test: Customize for sim card x and not for sim card y, insert both sim cards in a dual sim device and see the difference. Merged-In: I067d55b9ae5e1346dd3b3cd50a0097b05b100055 Change-Id: I067d55b9ae5e1346dd3b3cd50a0097b05b100055 --- .../android/settingslib/net/SignalStrengthUtil.java | 13 ++++++++++--- .../statusbar/policy/NetworkControllerImpl.java | 3 --- .../android/telephony/CarrierConfigManager.java | 10 ++++++++++ 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/net/SignalStrengthUtil.java b/packages/SettingsLib/src/com/android/settingslib/net/SignalStrengthUtil.java index 246f2ceac87c9..e1174fa05ea50 100644 --- a/packages/SettingsLib/src/com/android/settingslib/net/SignalStrengthUtil.java +++ b/packages/SettingsLib/src/com/android/settingslib/net/SignalStrengthUtil.java @@ -17,7 +17,8 @@ package com.android.settingslib.net; import android.content.Context; -import android.telephony.SubscriptionManager; +import android.os.PersistableBundle; +import android.telephony.CarrierConfigManager; /** * Utilities for dealing with signal strength. @@ -28,7 +29,13 @@ public class SignalStrengthUtil { * bar for the subscription with the given id */ public static boolean shouldInflateSignalStrength(Context context, int subscriptionId) { - return SubscriptionManager.getResourcesForSubId(context, subscriptionId) - .getBoolean(com.android.internal.R.bool.config_inflateSignalStrength); + final CarrierConfigManager carrierConfigMgr = + context.getSystemService(CarrierConfigManager.class); + PersistableBundle bundle = null; + if (carrierConfigMgr != null) { + bundle = carrierConfigMgr.getConfigForSubId(subscriptionId); + } + return (bundle != null && bundle.getBoolean( + CarrierConfigManager.KEY_INFLATE_SIGNAL_STRENGTH_BOOL, false)); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java index 3b08ef5fc1e1e..e4feaaef5c445 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java @@ -1157,7 +1157,6 @@ public class NetworkControllerImpl extends BroadcastReceiver boolean show4gForLte = false; boolean hideLtePlus = false; boolean hspaDataDistinguishable; - boolean inflateSignalStrengths = false; boolean alwaysShowDataRatIcon = false; static Config readConfig(Context context) { @@ -1169,8 +1168,6 @@ public class NetworkControllerImpl extends BroadcastReceiver res.getBoolean(com.android.internal.R.bool.config_alwaysUseCdmaRssi); config.hspaDataDistinguishable = res.getBoolean(R.bool.config_hspa_data_distinguishable); - config.inflateSignalStrengths = res.getBoolean( - com.android.internal.R.bool.config_inflateSignalStrength); CarrierConfigManager configMgr = (CarrierConfigManager) context.getSystemService(Context.CARRIER_CONFIG_SERVICE); diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 7c96f05f63059..2c8d3783cc422 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1085,6 +1085,15 @@ public class CarrierConfigManager { public static final String KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL = "show_signal_strength_in_sim_status_bool"; + /** + * Flag specifying if we should interpret all signal strength as one bar higher + * This is a replacement for the resource config_inflateSignalStrength + * The default value is false. + * @hide + */ + public static final String KEY_INFLATE_SIGNAL_STRENGTH_BOOL = + "inflate_signal_strength_bool"; + /** * Flag specifying whether an additional (client initiated) intent needs to be sent on System * update @@ -3915,6 +3924,7 @@ public class CarrierConfigManager { sDefaults.putStringArray(KEY_CARRIER_VVM_PACKAGE_NAME_STRING_ARRAY, null); sDefaults.putBoolean(KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL, false); sDefaults.putBoolean(KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL, true); + sDefaults.putBoolean(KEY_INFLATE_SIGNAL_STRENGTH_BOOL, false); sDefaults.putBoolean(KEY_CI_ACTION_ON_SYS_UPDATE_BOOL, false); sDefaults.putString(KEY_CI_ACTION_ON_SYS_UPDATE_INTENT_STRING, ""); sDefaults.putString(KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_STRING, ""); From 59c556050975ba83532b7a61c72a02b27516f231 Mon Sep 17 00:00:00 2001 From: Mattias Nilsson Date: Fri, 24 Jan 2020 18:33:21 +0100 Subject: [PATCH 2/2] Remove config_inflateSignalStrength This resource has moved to CarrierConfig to support dual sim devices and MVNOs. Bug: 148483577 Test: Manual Merged-In: I494cb93a2c72ff3df2ef45ad737c5606132e32d1 Change-Id: I494cb93a2c72ff3df2ef45ad737c5606132e32d1 --- core/res/res/values-mcc310-mnc030/config.xml | 26 ------------------- core/res/res/values-mcc310-mnc070/config.xml | 26 ------------------- core/res/res/values-mcc310-mnc170/config.xml | 3 --- core/res/res/values-mcc310-mnc280/config.xml | 26 ------------------- core/res/res/values-mcc310-mnc380/config.xml | 3 --- core/res/res/values-mcc310-mnc410/config.xml | 3 --- core/res/res/values-mcc310-mnc560/config.xml | 3 --- core/res/res/values-mcc310-mnc950/config.xml | 26 ------------------- core/res/res/values-mcc311-mnc180/config.xml | 3 --- core/res/res/values-mcc311-mnc480/config.xml | 3 --- core/res/res/values/config.xml | 4 --- core/res/res/values/symbols.xml | 1 - .../telephony/CarrierConfigManager.java | 2 +- 13 files changed, 1 insertion(+), 128 deletions(-) delete mode 100644 core/res/res/values-mcc310-mnc030/config.xml delete mode 100644 core/res/res/values-mcc310-mnc070/config.xml delete mode 100644 core/res/res/values-mcc310-mnc280/config.xml delete mode 100644 core/res/res/values-mcc310-mnc950/config.xml diff --git a/core/res/res/values-mcc310-mnc030/config.xml b/core/res/res/values-mcc310-mnc030/config.xml deleted file mode 100644 index 26b9192e0cc3b..0000000000000 --- a/core/res/res/values-mcc310-mnc030/config.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - true - - diff --git a/core/res/res/values-mcc310-mnc070/config.xml b/core/res/res/values-mcc310-mnc070/config.xml deleted file mode 100644 index 26b9192e0cc3b..0000000000000 --- a/core/res/res/values-mcc310-mnc070/config.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - true - - diff --git a/core/res/res/values-mcc310-mnc170/config.xml b/core/res/res/values-mcc310-mnc170/config.xml index 12e448cd6b211..f6cddc9bb2a38 100644 --- a/core/res/res/values-mcc310-mnc170/config.xml +++ b/core/res/res/values-mcc310-mnc170/config.xml @@ -20,9 +20,6 @@ - - true - true diff --git a/core/res/res/values-mcc310-mnc280/config.xml b/core/res/res/values-mcc310-mnc280/config.xml deleted file mode 100644 index 26b9192e0cc3b..0000000000000 --- a/core/res/res/values-mcc310-mnc280/config.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - true - - diff --git a/core/res/res/values-mcc310-mnc380/config.xml b/core/res/res/values-mcc310-mnc380/config.xml index 12e448cd6b211..f6cddc9bb2a38 100644 --- a/core/res/res/values-mcc310-mnc380/config.xml +++ b/core/res/res/values-mcc310-mnc380/config.xml @@ -20,9 +20,6 @@ - - true - true diff --git a/core/res/res/values-mcc310-mnc410/config.xml b/core/res/res/values-mcc310-mnc410/config.xml index 22b8fefcecf41..6943bd443cdce 100644 --- a/core/res/res/values-mcc310-mnc410/config.xml +++ b/core/res/res/values-mcc310-mnc410/config.xml @@ -49,9 +49,6 @@ "#9" - - true - true diff --git a/core/res/res/values-mcc310-mnc560/config.xml b/core/res/res/values-mcc310-mnc560/config.xml index 12e448cd6b211..f6cddc9bb2a38 100644 --- a/core/res/res/values-mcc310-mnc560/config.xml +++ b/core/res/res/values-mcc310-mnc560/config.xml @@ -20,9 +20,6 @@ - - true - true diff --git a/core/res/res/values-mcc310-mnc950/config.xml b/core/res/res/values-mcc310-mnc950/config.xml deleted file mode 100644 index 26b9192e0cc3b..0000000000000 --- a/core/res/res/values-mcc310-mnc950/config.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - true - - diff --git a/core/res/res/values-mcc311-mnc180/config.xml b/core/res/res/values-mcc311-mnc180/config.xml index 12e448cd6b211..f6cddc9bb2a38 100644 --- a/core/res/res/values-mcc311-mnc180/config.xml +++ b/core/res/res/values-mcc311-mnc180/config.xml @@ -20,9 +20,6 @@ - - true - true diff --git a/core/res/res/values-mcc311-mnc480/config.xml b/core/res/res/values-mcc311-mnc480/config.xml index 336e30e45b006..db2f8d01f93a9 100755 --- a/core/res/res/values-mcc311-mnc480/config.xml +++ b/core/res/res/values-mcc311-mnc480/config.xml @@ -40,7 +40,4 @@ true - - true - diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 3d73ade33d5bd..7b90ca27e3714 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -4345,10 +4345,6 @@ only. The component must be part of a system app. --> - - false - diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index ece65ff214871..f844e451af6bb 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3861,7 +3861,6 @@ - diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 2c8d3783cc422..648855eac9f44 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1087,7 +1087,7 @@ public class CarrierConfigManager { /** * Flag specifying if we should interpret all signal strength as one bar higher - * This is a replacement for the resource config_inflateSignalStrength + * This is a replacement for the former resource config_inflateSignalStrength * The default value is false. * @hide */