PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Settings] Adopting public API" am: 8ddd0da0a1 am: 40d2a2dd8d am: 11fa77b023

Browse Source 
Change-Id: I87282b78a9db6eb3611591f0c4702447b8470db4
This commit is contained in:
Automerger Merge Worker
2019-12-16 08:31:03 +00:00
parent 4b6ff82d92 11fa77b023
commit 107cd136a3
12 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/ResetNetwork.java
View File

@@ -166,7 +166,7 @@ public class ResetNetwork extends InstrumentedFragment {
mEsimCheckbox = mContentView.findViewById(R.id.erase_esim); mEsimCheckbox = mContentView.findViewById(R.id.erase_esim);
mSubscriptions = SubscriptionManager.from(getActivity()) mSubscriptions = SubscriptionManager.from(getActivity())
.getActiveSubscriptionInfoList(true); .getActiveSubscriptionInfoList();
if (mSubscriptions != null && mSubscriptions.size() > 0) { if (mSubscriptions != null && mSubscriptions.size() > 0) {
// Get the default subscription in the order of data, voice, sms, first up. // Get the default subscription in the order of data, voice, sms, first up.
int defaultSubscription = SubscriptionManager.getDefaultDataSubscriptionId(); int defaultSubscription = SubscriptionManager.getDefaultDataSubscriptionId();

2
src/com/android/settings/datausage/DataUsageUtils.java
View File

@@ -107,7 +107,7 @@ public final class DataUsageUtils extends com.android.settingslib.net.DataUsageU
return SystemProperties.get(DataUsageUtils.TEST_RADIOS_PROP).contains("mobile"); return SystemProperties.get(DataUsageUtils.TEST_RADIOS_PROP).contains("mobile");
} }
final List<SubscriptionInfo> subInfoList = final List<SubscriptionInfo> subInfoList =
SubscriptionManager.from(context).getActiveSubscriptionInfoList(true); SubscriptionManager.from(context).getActiveSubscriptionInfoList();
// No activated Subscriptions // No activated Subscriptions
if (subInfoList == null) { if (subInfoList == null) {
if (LOGD) { if (LOGD) {

4
src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
View File

@@ -123,7 +123,7 @@ public class PhoneNumberPreferenceController extends BasePreferenceController {
private CharSequence getFirstPhoneNumber() { private CharSequence getFirstPhoneNumber() {
final List<SubscriptionInfo> subscriptionInfoList = final List<SubscriptionInfo> subscriptionInfoList =
mSubscriptionManager.getActiveSubscriptionInfoList(true); mSubscriptionManager.getActiveSubscriptionInfoList();
if (subscriptionInfoList == null || subscriptionInfoList.isEmpty()) { if (subscriptionInfoList == null || subscriptionInfoList.isEmpty()) {
return mContext.getText(R.string.device_info_default); return mContext.getText(R.string.device_info_default);
} }
@@ -150,7 +150,7 @@ public class PhoneNumberPreferenceController extends BasePreferenceController {
@VisibleForTesting @VisibleForTesting
SubscriptionInfo getSubscriptionInfo(int simSlot) { SubscriptionInfo getSubscriptionInfo(int simSlot) {
final List<SubscriptionInfo> subscriptionInfoList = final List<SubscriptionInfo> subscriptionInfoList =
mSubscriptionManager.getActiveSubscriptionInfoList(true); mSubscriptionManager.getActiveSubscriptionInfoList();
if (subscriptionInfoList != null) { if (subscriptionInfoList != null) {
for (SubscriptionInfo info : subscriptionInfoList) { for (SubscriptionInfo info : subscriptionInfoList) {
if (info.getSimSlotIndex() == simSlot) { if (info.getSimSlotIndex() == simSlot) {

2
src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java
View File

@@ -107,7 +107,7 @@ public class SimStatusPreferenceController extends
private CharSequence getCarrierName(int simSlot) { private CharSequence getCarrierName(int simSlot) {
final List<SubscriptionInfo> subscriptionInfoList = final List<SubscriptionInfo> subscriptionInfoList =
mSubscriptionManager.getActiveSubscriptionInfoList(true); mSubscriptionManager.getActiveSubscriptionInfoList();
if (subscriptionInfoList != null) { if (subscriptionInfoList != null) {
for (SubscriptionInfo info : subscriptionInfoList) { for (SubscriptionInfo info : subscriptionInfoList) {
if (info.getSimSlotIndex() == simSlot) { if (info.getSimSlotIndex() == simSlot) {

2
src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java
View File

@@ -111,7 +111,7 @@ public class DeviceInfoSlice implements CustomSliceable {
@VisibleForTesting @VisibleForTesting
SubscriptionInfo getFirstSubscriptionInfo() { SubscriptionInfo getFirstSubscriptionInfo() {
final List<SubscriptionInfo> subscriptionInfoList = final List<SubscriptionInfo> subscriptionInfoList =
mSubscriptionManager.getActiveSubscriptionInfoList(true); mSubscriptionManager.getActiveSubscriptionInfoList();
if (subscriptionInfoList == null || subscriptionInfoList.isEmpty()) { if (subscriptionInfoList == null || subscriptionInfoList.isEmpty()) {
return null; return null;
} }

2
src/com/android/settings/network/SubscriptionUtil.java
View File

@@ -50,7 +50,7 @@ public class SubscriptionUtil {
if (sActiveResultsForTesting != null) { if (sActiveResultsForTesting != null) {
return sActiveResultsForTesting; return sActiveResultsForTesting;
} }
final List<SubscriptionInfo> subscriptions = manager.getActiveSubscriptionInfoList(true); final List<SubscriptionInfo> subscriptions = manager.getActiveSubscriptionInfoList();
if (subscriptions == null) { if (subscriptions == null) {
return new ArrayList<>(); return new ArrayList<>();
} }

2
src/com/android/settings/network/telephony/MobileNetworkUtils.java
View File

@@ -271,7 +271,7 @@ public class MobileNetworkUtils {
if (disableOtherSubscriptions) { if (disableOtherSubscriptions) {
final List<SubscriptionInfo> subInfoList = final List<SubscriptionInfo> subInfoList =
subscriptionManager.getActiveSubscriptionInfoList(true); subscriptionManager.getActiveSubscriptionInfoList();
if (subInfoList != null) { if (subInfoList != null) {
for (SubscriptionInfo subInfo : subInfoList) { for (SubscriptionInfo subInfo : subInfoList) {
// We never disable mobile data for opportunistic subscriptions. // We never disable mobile data for opportunistic subscriptions.

2
src/com/android/settings/sim/SimListDialogFragment.java
View File

@@ -94,7 +94,7 @@ public class SimListDialogFragment extends SimDialogFragment implements
protected List<SubscriptionInfo> getCurrentSubscriptions() { protected List<SubscriptionInfo> getCurrentSubscriptions() {
final SubscriptionManager manager = getContext().getSystemService( final SubscriptionManager manager = getContext().getSystemService(
SubscriptionManager.class); SubscriptionManager.class);
return manager.getActiveSubscriptionInfoList(true); return manager.getActiveSubscriptionInfoList();
} }
@Override @Override

7
tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java
View File

@@ -21,7 +21,6 @@ import static android.content.Context.CLIPBOARD_SERVICE;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@@ -141,7 +140,7 @@ public class PhoneNumberPreferenceControllerTest {
@Test @Test
public void getSummary_cannotGetActiveSubscriptionInfo_shouldShowUnknown() { public void getSummary_cannotGetActiveSubscriptionInfo_shouldShowUnknown() {
when(mSubscriptionManager.getActiveSubscriptionInfoList(eq(true))).thenReturn(null); when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(null);
CharSequence primaryNumber = mController.getSummary(); CharSequence primaryNumber = mController.getSummary();
@@ -152,7 +151,7 @@ public class PhoneNumberPreferenceControllerTest {
@Test @Test
public void getSummary_getEmptySubscriptionInfo_shouldShowUnknown() { public void getSummary_getEmptySubscriptionInfo_shouldShowUnknown() {
List<SubscriptionInfo> infos = new ArrayList<>(); List<SubscriptionInfo> infos = new ArrayList<>();
when(mSubscriptionManager.getActiveSubscriptionInfoList(eq(true))).thenReturn(infos); when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(infos);
CharSequence primaryNumber = mController.getSummary(); CharSequence primaryNumber = mController.getSummary();
@@ -168,7 +167,7 @@ public class PhoneNumberPreferenceControllerTest {
public void copy_shouldCopyPhoneNumberToClipboard() { public void copy_shouldCopyPhoneNumberToClipboard() {
final List<SubscriptionInfo> list = new ArrayList<>(); final List<SubscriptionInfo> list = new ArrayList<>();
list.add(mSubscriptionInfo); list.add(mSubscriptionInfo);
when(mSubscriptionManager.getActiveSubscriptionInfoList(eq(true))).thenReturn(list); when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(list);
final String phoneNumber = "1111111111"; final String phoneNumber = "1111111111";
doReturn(phoneNumber).when(mController).getFormattedPhoneNumber(mSubscriptionInfo); doReturn(phoneNumber).when(mController).getFormattedPhoneNumber(mSubscriptionInfo);

7
tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java
View File

@@ -21,7 +21,6 @@ import static android.telephony.UiccSlotInfo.CARD_STATE_INFO_PRESENT;
import static com.google.common.truth.Truth.assertThat; 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.doReturn;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@@ -162,7 +161,7 @@ public class SubscriptionUtilTest {
@Test @Test
public void getActiveSubscriptions_nullInfoFromSubscriptionManager_nonNullResult() { public void getActiveSubscriptions_nullInfoFromSubscriptionManager_nonNullResult() {
when(mSubMgr.getActiveSubscriptionInfoList(anyBoolean())).thenReturn(null); when(mSubMgr.getActiveSubscriptionInfoList()).thenReturn(null);
final List<SubscriptionInfo> subs = SubscriptionUtil.getActiveSubscriptions(mSubMgr); final List<SubscriptionInfo> subs = SubscriptionUtil.getActiveSubscriptions(mSubMgr);
assertThat(subs).isNotNull(); assertThat(subs).isNotNull();
assertThat(subs).isEmpty(); assertThat(subs).isEmpty();
@@ -171,7 +170,7 @@ public class SubscriptionUtilTest {
@Test @Test
public void getActiveSubscriptions_oneSubscription_oneResult() { public void getActiveSubscriptions_oneSubscription_oneResult() {
final SubscriptionInfo info = mock(SubscriptionInfo.class); final SubscriptionInfo info = mock(SubscriptionInfo.class);
when(mSubMgr.getActiveSubscriptionInfoList(anyBoolean())).thenReturn(Arrays.asList(info)); when(mSubMgr.getActiveSubscriptionInfoList()).thenReturn(Arrays.asList(info));
final List<SubscriptionInfo> subs = SubscriptionUtil.getActiveSubscriptions(mSubMgr); final List<SubscriptionInfo> subs = SubscriptionUtil.getActiveSubscriptions(mSubMgr);
assertThat(subs).isNotNull(); assertThat(subs).isNotNull();
assertThat(subs).hasSize(1); assertThat(subs).hasSize(1);
@@ -181,7 +180,7 @@ public class SubscriptionUtilTest {
public void getActiveSubscriptions_twoSubscriptions_twoResults() { public void getActiveSubscriptions_twoSubscriptions_twoResults() {
final SubscriptionInfo info1 = mock(SubscriptionInfo.class); final SubscriptionInfo info1 = mock(SubscriptionInfo.class);
final SubscriptionInfo info2 = mock(SubscriptionInfo.class); final SubscriptionInfo info2 = mock(SubscriptionInfo.class);
when(mSubMgr.getActiveSubscriptionInfoList(anyBoolean())).thenReturn( when(mSubMgr.getActiveSubscriptionInfoList()).thenReturn(
Arrays.asList(info1, info2)); Arrays.asList(info1, info2));
final List<SubscriptionInfo> subs = SubscriptionUtil.getActiveSubscriptions(mSubMgr); final List<SubscriptionInfo> subs = SubscriptionUtil.getActiveSubscriptions(mSubMgr);
assertThat(subs).isNotNull(); assertThat(subs).isNotNull();

3
tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java
View File

@@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
@@ -112,7 +111,7 @@ public class MobileNetworkUtilsTest {
when(mSubscriptionInfo2.getSubscriptionId()).thenReturn(SUB_ID_2); when(mSubscriptionInfo2.getSubscriptionId()).thenReturn(SUB_ID_2);
when(mSubscriptionInfo2.getCarrierName()).thenReturn(PLMN_FROM_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)); Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2));
when(mSubscriptionManager.getAccessibleSubscriptionInfoList()).thenReturn( when(mSubscriptionManager.getAccessibleSubscriptionInfoList()).thenReturn(
Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2)); Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2));

3
tests/robotests/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java
View File

@@ -17,7 +17,6 @@
package com.android.settings.network.telephony.gsm; package com.android.settings.network.telephony.gsm;
import static com.google.common.truth.Truth.assertThat; 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.doReturn;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@@ -83,7 +82,7 @@ public class OpenNetworkSelectPagePreferenceControllerTest {
when(mSubscriptionInfo.getSubscriptionId()).thenReturn(SUB_ID); when(mSubscriptionInfo.getSubscriptionId()).thenReturn(SUB_ID);
when(mSubscriptionInfo.getCarrierName()).thenReturn(OPERATOR_NAME); when(mSubscriptionInfo.getCarrierName()).thenReturn(OPERATOR_NAME);
when(mSubscriptionManager.getActiveSubscriptionInfoList(eq(true))).thenReturn( when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
Arrays.asList(mSubscriptionInfo)); Arrays.asList(mSubscriptionInfo));
when(mSubscriptionManager.getAccessibleSubscriptionInfoList()).thenReturn( when(mSubscriptionManager.getAccessibleSubscriptionInfoList()).thenReturn(
Arrays.asList(mSubscriptionInfo)); Arrays.asList(mSubscriptionInfo));