From 40468064ed3494ae90d6c3cf0505581c506c2142 Mon Sep 17 00:00:00 2001 From: Sooraj Sasindran Date: Mon, 6 Jan 2020 19:10:50 -0800 Subject: [PATCH] change getActiveAndHiddenSubscriptionInfoList API name getActiveAndHiddenSubscriptionInfoList to getCompleteActiveSubscriptionInfoList Bug: 144791721 Test: make Merged-In: I6202c4039d858ccfed1d09e8b315d701bb571ccf Change-Id: I6202c4039d858ccfed1d09e8b315d701bb571ccf (cherry picked from commit feb6aa47b408f92e605089dd9ad7c992861c2dc2) --- api/current.txt | 2 +- .../src/com/android/keyguard/KeyguardUpdateMonitor.java | 6 +++--- .../systemui/statusbar/policy/NetworkControllerImpl.java | 2 +- .../com/android/keyguard/CarrierTextControllerTest.java | 2 +- .../com/android/keyguard/KeyguardUpdateMonitorTest.java | 2 +- .../statusbar/policy/NetworkControllerBaseTest.java | 2 +- .../java/android/telephony/SubscriptionManager.java | 9 +++++++-- 7 files changed, 15 insertions(+), 10 deletions(-) diff --git a/api/current.txt b/api/current.txt index 283d9b6bd6ad1..b18179cb8c197 100644 --- a/api/current.txt +++ b/api/current.txt @@ -48052,13 +48052,13 @@ package android.telephony { method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.os.ParcelUuid createSubscriptionGroup(@NonNull java.util.List); method @Deprecated public static android.telephony.SubscriptionManager from(android.content.Context); method public java.util.List getAccessibleSubscriptionInfoList(); - method @Nullable public java.util.List getActiveAndHiddenSubscriptionInfoList(); method public static int getActiveDataSubscriptionId(); method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public android.telephony.SubscriptionInfo getActiveSubscriptionInfo(int); method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int getActiveSubscriptionInfoCount(); method public int getActiveSubscriptionInfoCountMax(); method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public android.telephony.SubscriptionInfo getActiveSubscriptionInfoForSimSlotIndex(int); method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.List getActiveSubscriptionInfoList(); + method @NonNull public java.util.List getCompleteActiveSubscriptionInfoList(); method public static int getDefaultDataSubscriptionId(); method public static int getDefaultSmsSubscriptionId(); method public static int getDefaultSubscriptionId(); diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java index 4508fc74e8844..e79005a9ffc2b 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -379,7 +379,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab if (DEBUG_SIM_STATES) { Log.v(TAG, "onSubscriptionInfoChanged()"); List sil = mSubscriptionManager - .getActiveAndHiddenSubscriptionInfoList(); + .getCompleteActiveSubscriptionInfoList(); if (sil != null) { for (SubscriptionInfo subInfo : sil) { Log.v(TAG, "SubInfo:" + subInfo); @@ -433,10 +433,10 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab public List getSubscriptionInfo(boolean forceReload) { List sil = mSubscriptionInfo; if (sil == null || forceReload) { - sil = mSubscriptionManager.getActiveAndHiddenSubscriptionInfoList(); + sil = mSubscriptionManager.getCompleteActiveSubscriptionInfoList(); } if (sil == null) { - // getActiveAndHiddenSubscriptionInfoList was null callers expect an empty list. + // getCompleteActiveSubscriptionInfoList was null callers expect an empty list. mSubscriptionInfo = new ArrayList(); } else { mSubscriptionInfo = sil; 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 b84208c9ac359..99709402573cf 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java @@ -630,7 +630,7 @@ public class NetworkControllerImpl extends BroadcastReceiver @VisibleForTesting void doUpdateMobileControllers() { List subscriptions = mSubscriptionManager - .getActiveAndHiddenSubscriptionInfoList(); + .getCompleteActiveSubscriptionInfoList(); if (subscriptions == null) { subscriptions = Collections.emptyList(); } diff --git a/packages/SystemUI/tests/src/com/android/keyguard/CarrierTextControllerTest.java b/packages/SystemUI/tests/src/com/android/keyguard/CarrierTextControllerTest.java index ea6cf33297729..f7daf974b8344 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/CarrierTextControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/CarrierTextControllerTest.java @@ -249,7 +249,7 @@ public class CarrierTextControllerTest extends SysuiTestCase { // STOPSHIP(b/130246708) This line makes sure that SubscriptionManager provides the // same answer as KeyguardUpdateMonitor. Remove when this is addressed - when(mSubscriptionManager.getActiveAndHiddenSubscriptionInfoList()).thenReturn( + when(mSubscriptionManager.getCompleteActiveSubscriptionInfoList()).thenReturn( new ArrayList<>()); when(mKeyguardUpdateMonitor.getSimState(anyInt())).thenReturn( diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java index eead1204aa11b..4f4ce13e41ca5 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java @@ -516,7 +516,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { List list = new ArrayList<>(); list.add(TEST_SUBSCRIPTION); list.add(TEST_SUBSCRIPTION_2); - when(mSubscriptionManager.getActiveAndHiddenSubscriptionInfoList()).thenReturn(list); + when(mSubscriptionManager.getCompleteActiveSubscriptionInfoList()).thenReturn(list); mKeyguardUpdateMonitor.mPhoneStateListener.onActiveDataSubscriptionIdChanged( TEST_SUBSCRIPTION_2.getSubscriptionId()); mTestableLooper.processAllMessages(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java index a0d551c743c43..831925f8bb26b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java @@ -235,7 +235,7 @@ public class NetworkControllerBaseTest extends SysuiTestCase { subs.add(subscription); } when(mMockSm.getActiveSubscriptionInfoList()).thenReturn(subs); - when(mMockSm.getActiveAndHiddenSubscriptionInfoList()).thenReturn(subs); + when(mMockSm.getCompleteActiveSubscriptionInfoList()).thenReturn(subs); mNetworkController.doUpdateMobileControllers(); } diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 8ac9023b33dc0..5a840de36cfb2 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -1300,8 +1300,13 @@ public class SubscriptionManager { * both active and hidden SubscriptionInfos. * */ - public @Nullable List getActiveAndHiddenSubscriptionInfoList() { - return getActiveSubscriptionInfoList(/* userVisibleonly */false); + public @NonNull List getCompleteActiveSubscriptionInfoList() { + List completeList = getActiveSubscriptionInfoList( + /* userVisibleonly */false); + if (completeList == null) { + completeList = new ArrayList<>(); + } + return completeList; } /**