diff options
author | Youngtae Cha <youngtaecha@google.com> | 2021-12-08 04:19:57 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-12-08 04:19:57 +0000 |
commit | 4c91964ac171315e4829dd2b416a07152271657f (patch) | |
tree | 0b1d2bd0a216443a367f9fdba2d7e6130903a163 | |
parent | 82dc7a5b8ed2c2da2edf4ef55a98a2af66dcac96 (diff) | |
parent | 95fd52b0941c77b13c53ea57503ca854e3d04d5a (diff) | |
download | CellBroadcastReceiver-4c91964ac171315e4829dd2b416a07152271657f.tar.gz |
Merge "Disable testing_mode on below conditions." into sc-mainline-prod
-rw-r--r-- | src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java b/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java index e4a114b1f..14ebe3b0c 100644 --- a/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java +++ b/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java @@ -275,7 +275,7 @@ public class CellBroadcastReceiver extends BroadcastReceiver { * @param context the context * @param subId subId of the carrier config event */ - private void resetSettingsIfCarrierChanged(Context context, int subId) { + private void resetSettingsAsNeeded(Context context, int subId) { // subId may be -1 if carrier config broadcast is being sent on SIM removal if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) { if (getPreviousCarrierIdForDefaultSub() == NO_PREVIOUS_CARRIER_ID) { @@ -318,6 +318,17 @@ public class CellBroadcastReceiver extends BroadcastReceiver { return; } + /** When user_build_mode is true and alow_testing_mode_on_user_build is false + * then testing_mode is not able to be true at all. + */ + Resources res = getResourcesMethod(); + if (!res.getBoolean(R.bool.allow_testing_mode_on_user_build) + && SystemProperties.getInt("ro.debuggable", 0) == 0 + && CellBroadcastReceiver.isTestingMode(context)) { + Log.d(TAG, "it can't be testing_mode at all"); + setTestingMode(false); + } + if (carrierId != previousCarrierId) { saveCarrierIdForDefaultSub(carrierId); startConfigService(context, @@ -445,7 +456,7 @@ public class CellBroadcastReceiver extends BroadcastReceiver { if (isSystemUser()) { Log.d(TAG, "initializeSharedPreference"); - resetSettingsIfCarrierChanged(context, subId); + resetSettingsAsNeeded(context, subId); SharedPreferences sp = getDefaultSharedPreferences(); |