diff options
| author | Chen Xu <fionaxu@google.com> | 2021-03-12 01:40:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-12 01:40:37 +0000 |
| commit | 697c8c193f1212016a9e2b762f39cb1afabf2a1a (patch) | |
| tree | 4aeb791005ecd01f152fe9091985b7709f76bbe0 /src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java | |
| parent | c44f3aa25698766937044a9e849b4a2a92ca78ff (diff) | |
| parent | 92a0b96160dd84accd7a7d39611b611f38ace4d7 (diff) | |
| download | CellBroadcastReceiver-697c8c193f1212016a9e2b762f39cb1afabf2a1a.tar.gz | |
Merge "settings page is not loading correctly with msim" into mainline-prod am: 92a0b96160
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/13835190
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id0154e35ae449da803f398960cca2e118607523b
Diffstat (limited to 'src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java')
| -rw-r--r-- | src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java index 844e0789a..0e30250d8 100644 --- a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java +++ b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java @@ -549,7 +549,7 @@ public class CellBroadcastSettings extends CollapsingToolbarBaseActivity { Resources res = CellBroadcastSettings.getResourcesForDefaultSubId(getContext()); CellBroadcastChannelManager channelManager = new CellBroadcastChannelManager( - getContext(), SubscriptionManager.DEFAULT_SUBSCRIPTION_ID); + getContext(), SubscriptionManager.getDefaultSubscriptionId()); if (mMasterToggle != null) { mMasterToggle.setVisible(res.getBoolean(R.bool.show_main_switch_settings)); @@ -759,7 +759,7 @@ public class CellBroadcastSettings extends CollapsingToolbarBaseActivity { public static boolean isTestAlertsToggleVisible(Context context) { CellBroadcastChannelManager channelManager = new CellBroadcastChannelManager(context, - SubscriptionManager.DEFAULT_SUBSCRIPTION_ID); + SubscriptionManager.getDefaultSubscriptionId()); Resources res = CellBroadcastSettings.getResourcesForDefaultSubId(context); boolean isTestAlertsAvailable = !channelManager.getCellBroadcastChannelRanges( R.array.required_monthly_test_range_strings).isEmpty() |