From 1247771b88f131444507924e9f4d20b735a58f83 Mon Sep 17 00:00:00 2001 From: Bonian Chen Date: Mon, 16 Dec 2019 13:55:54 +0800 Subject: [PATCH] [Settings] Adopting public API Replace SubscriptionManager#getActiveSubscriptionInfoList(true) by SubscriptionManager#getActiveSubscriptionInfoList() since they're equivalent. Bug: 146312766 Test: build pass Change-Id: Iab8a141277e0199f75a3419527e15d63669224fc --- src/com/android/settings/ResetNetwork.java | 2 +- src/com/android/settings/datausage/DataUsageUtils.java | 2 +- .../deviceinfo/PhoneNumberPreferenceController.java | 4 ++-- .../simstatus/SimStatusPreferenceController.java | 2 +- .../contextualcards/deviceinfo/DeviceInfoSlice.java | 2 +- src/com/android/settings/network/SubscriptionUtil.java | 2 +- .../settings/network/telephony/MobileNetworkUtils.java | 2 +- src/com/android/settings/sim/SimListDialogFragment.java | 2 +- .../deviceinfo/PhoneNumberPreferenceControllerTest.java | 7 +++---- .../com/android/settings/network/SubscriptionUtilTest.java | 7 +++---- .../settings/network/telephony/MobileNetworkUtilsTest.java | 3 +-- .../gsm/OpenNetworkSelectPagePreferenceControllerTest.java | 3 +-- 12 files changed, 17 insertions(+), 21 deletions(-) diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java index 4fbc09db9b1..5ac2c0bf85a 100644 --- a/src/com/android/settings/ResetNetwork.java +++ b/src/com/android/settings/ResetNetwork.java @@ -166,7 +166,7 @@ public class ResetNetwork extends InstrumentedFragment { mEsimCheckbox = mContentView.findViewById(R.id.erase_esim); mSubscriptions = SubscriptionManager.from(getActivity()) - .getActiveSubscriptionInfoList(true); + .getActiveSubscriptionInfoList(); if (mSubscriptions != null && mSubscriptions.size() > 0) { // Get the default subscription in the order of data, voice, sms, first up. int defaultSubscription = SubscriptionManager.getDefaultDataSubscriptionId(); diff --git a/src/com/android/settings/datausage/DataUsageUtils.java b/src/com/android/settings/datausage/DataUsageUtils.java index bc9499b55df..0e400a241f9 100644 --- a/src/com/android/settings/datausage/DataUsageUtils.java +++ b/src/com/android/settings/datausage/DataUsageUtils.java @@ -107,7 +107,7 @@ public final class DataUsageUtils extends com.android.settingslib.net.DataUsageU return SystemProperties.get(DataUsageUtils.TEST_RADIOS_PROP).contains("mobile"); } final List subInfoList = - SubscriptionManager.from(context).getActiveSubscriptionInfoList(true); + SubscriptionManager.from(context).getActiveSubscriptionInfoList(); // No activated Subscriptions if (subInfoList == null) { if (LOGD) { diff --git a/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java index 55e8dc2ac50..5d38dd5666e 100644 --- a/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java +++ b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java @@ -117,7 +117,7 @@ public class PhoneNumberPreferenceController extends BasePreferenceController { private CharSequence getFirstPhoneNumber() { final List subscriptionInfoList = - mSubscriptionManager.getActiveSubscriptionInfoList(true); + mSubscriptionManager.getActiveSubscriptionInfoList(); if (subscriptionInfoList == null || subscriptionInfoList.isEmpty()) { return mContext.getText(R.string.device_info_default); } @@ -144,7 +144,7 @@ public class PhoneNumberPreferenceController extends BasePreferenceController { @VisibleForTesting SubscriptionInfo getSubscriptionInfo(int simSlot) { final List subscriptionInfoList = - mSubscriptionManager.getActiveSubscriptionInfoList(true); + mSubscriptionManager.getActiveSubscriptionInfoList(); if (subscriptionInfoList != null) { for (SubscriptionInfo info : subscriptionInfoList) { if (info.getSimSlotIndex() == simSlot) { diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java index ed01e22724a..02c191679d1 100644 --- a/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java +++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java @@ -107,7 +107,7 @@ public class SimStatusPreferenceController extends private CharSequence getCarrierName(int simSlot) { final List subscriptionInfoList = - mSubscriptionManager.getActiveSubscriptionInfoList(true); + mSubscriptionManager.getActiveSubscriptionInfoList(); if (subscriptionInfoList != null) { for (SubscriptionInfo info : subscriptionInfoList) { if (info.getSimSlotIndex() == simSlot) { diff --git a/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java b/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java index f3baaa1db6a..4a028b0db98 100644 --- a/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java +++ b/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java @@ -111,7 +111,7 @@ public class DeviceInfoSlice implements CustomSliceable { @VisibleForTesting SubscriptionInfo getFirstSubscriptionInfo() { final List subscriptionInfoList = - mSubscriptionManager.getActiveSubscriptionInfoList(true); + mSubscriptionManager.getActiveSubscriptionInfoList(); if (subscriptionInfoList == null || subscriptionInfoList.isEmpty()) { return null; } diff --git a/src/com/android/settings/network/SubscriptionUtil.java b/src/com/android/settings/network/SubscriptionUtil.java index f7235754f6c..9007c0b4cc9 100644 --- a/src/com/android/settings/network/SubscriptionUtil.java +++ b/src/com/android/settings/network/SubscriptionUtil.java @@ -50,7 +50,7 @@ public class SubscriptionUtil { if (sActiveResultsForTesting != null) { return sActiveResultsForTesting; } - final List subscriptions = manager.getActiveSubscriptionInfoList(true); + final List subscriptions = manager.getActiveSubscriptionInfoList(); if (subscriptions == null) { return new ArrayList<>(); } diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java index cd4489daa93..3bb3df228de 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java +++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java @@ -264,7 +264,7 @@ public class MobileNetworkUtils { if (disableOtherSubscriptions) { final List subInfoList = - subscriptionManager.getActiveSubscriptionInfoList(true); + subscriptionManager.getActiveSubscriptionInfoList(); if (subInfoList != null) { for (SubscriptionInfo subInfo : subInfoList) { // We never disable mobile data for opportunistic subscriptions. diff --git a/src/com/android/settings/sim/SimListDialogFragment.java b/src/com/android/settings/sim/SimListDialogFragment.java index 3b78927de5d..bb16fd47e33 100644 --- a/src/com/android/settings/sim/SimListDialogFragment.java +++ b/src/com/android/settings/sim/SimListDialogFragment.java @@ -94,7 +94,7 @@ public class SimListDialogFragment extends SimDialogFragment implements protected List getCurrentSubscriptions() { final SubscriptionManager manager = getContext().getSystemService( SubscriptionManager.class); - return manager.getActiveSubscriptionInfoList(true); + return manager.getActiveSubscriptionInfoList(); } @Override diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java index 3e6e4360f37..6c2f8e9a44d 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java @@ -21,7 +21,6 @@ import static android.content.Context.CLIPBOARD_SERVICE; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -141,7 +140,7 @@ public class PhoneNumberPreferenceControllerTest { @Test public void getSummary_cannotGetActiveSubscriptionInfo_shouldShowUnknown() { - when(mSubscriptionManager.getActiveSubscriptionInfoList(eq(true))).thenReturn(null); + when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(null); CharSequence primaryNumber = mController.getSummary(); @@ -152,7 +151,7 @@ public class PhoneNumberPreferenceControllerTest { @Test public void getSummary_getEmptySubscriptionInfo_shouldShowUnknown() { List infos = new ArrayList<>(); - when(mSubscriptionManager.getActiveSubscriptionInfoList(eq(true))).thenReturn(infos); + when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(infos); CharSequence primaryNumber = mController.getSummary(); @@ -168,7 +167,7 @@ public class PhoneNumberPreferenceControllerTest { public void copy_shouldCopyPhoneNumberToClipboard() { final List list = new ArrayList<>(); list.add(mSubscriptionInfo); - when(mSubscriptionManager.getActiveSubscriptionInfoList(eq(true))).thenReturn(list); + when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(list); final String phoneNumber = "1111111111"; doReturn(phoneNumber).when(mController).getFormattedPhoneNumber(mSubscriptionInfo); diff --git a/tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java b/tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java index 40b955ccd06..79609061381 100644 --- a/tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java +++ b/tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java @@ -21,7 +21,6 @@ import static android.telephony.UiccSlotInfo.CARD_STATE_INFO_PRESENT; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -162,7 +161,7 @@ public class SubscriptionUtilTest { @Test public void getActiveSubscriptions_nullInfoFromSubscriptionManager_nonNullResult() { - when(mSubMgr.getActiveSubscriptionInfoList(anyBoolean())).thenReturn(null); + when(mSubMgr.getActiveSubscriptionInfoList()).thenReturn(null); final List subs = SubscriptionUtil.getActiveSubscriptions(mSubMgr); assertThat(subs).isNotNull(); assertThat(subs).isEmpty(); @@ -171,7 +170,7 @@ public class SubscriptionUtilTest { @Test public void getActiveSubscriptions_oneSubscription_oneResult() { final SubscriptionInfo info = mock(SubscriptionInfo.class); - when(mSubMgr.getActiveSubscriptionInfoList(anyBoolean())).thenReturn(Arrays.asList(info)); + when(mSubMgr.getActiveSubscriptionInfoList()).thenReturn(Arrays.asList(info)); final List subs = SubscriptionUtil.getActiveSubscriptions(mSubMgr); assertThat(subs).isNotNull(); assertThat(subs).hasSize(1); @@ -181,7 +180,7 @@ public class SubscriptionUtilTest { public void getActiveSubscriptions_twoSubscriptions_twoResults() { final SubscriptionInfo info1 = mock(SubscriptionInfo.class); final SubscriptionInfo info2 = mock(SubscriptionInfo.class); - when(mSubMgr.getActiveSubscriptionInfoList(anyBoolean())).thenReturn( + when(mSubMgr.getActiveSubscriptionInfoList()).thenReturn( Arrays.asList(info1, info2)); final List subs = SubscriptionUtil.getActiveSubscriptions(mSubMgr); assertThat(subs).isNotNull(); diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java index c6b86896684..bf1ee8a157d 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java @@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; @@ -112,7 +111,7 @@ public class MobileNetworkUtilsTest { when(mSubscriptionInfo2.getSubscriptionId()).thenReturn(SUB_ID_2); when(mSubscriptionInfo2.getCarrierName()).thenReturn(PLMN_FROM_SUB_ID_2); - when(mSubscriptionManager.getActiveSubscriptionInfoList(eq(true))).thenReturn( + when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn( Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2)); when(mSubscriptionManager.getAccessibleSubscriptionInfoList()).thenReturn( Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2)); diff --git a/tests/robotests/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java index 6150675a8bc..5c182208d79 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.network.telephony.gsm; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -83,7 +82,7 @@ public class OpenNetworkSelectPagePreferenceControllerTest { when(mSubscriptionInfo.getSubscriptionId()).thenReturn(SUB_ID); when(mSubscriptionInfo.getCarrierName()).thenReturn(OPERATOR_NAME); - when(mSubscriptionManager.getActiveSubscriptionInfoList(eq(true))).thenReturn( + when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn( Arrays.asList(mSubscriptionInfo)); when(mSubscriptionManager.getAccessibleSubscriptionInfoList()).thenReturn( Arrays.asList(mSubscriptionInfo));