From 1a5351c433ee7a8584d34bf268635abf85190a85 Mon Sep 17 00:00:00 2001 From: changbetty Date: Wed, 8 Jan 2020 19:05:19 +0800 Subject: [PATCH] [Mainline] To use getActiveSubscriptionInfo() instead of get default subscription Info with data/sms/voice - getDefaultDataSubscriptionInfo() - getActiveSubscriptionInfo(getDefaultDataSubscriptionId()); - getDefaultSmsSubscriptionInfo() - getActiveSubscriptionInfo(getDefaultSmsSubscriptionId()); - getDefaultVoiceSubscriptionInfo() - getActiveSubscriptionInfo(getDefaultVoiceSubscriptionId()); Bug: 147206736 Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageUtilsTest make RunSettingsRoboTests ROBOTEST_FILTER=MobileDataSliceTest make RunSettingsRoboTests ROBOTEST_FILTER=MobileDataPreferenceControllerTest make RunSettingsRoboTests ROBOTEST_FILTER=DefaultSubscriptionControllerTest Change-Id: I7b5988b3c3068c12e242e123ebb54477093d37ad Merged-Id: I7b5988b3c3068c12e242e123ebb54477093d37ad --- .../telephony/CallsDefaultSubscriptionController.java | 2 +- .../network/telephony/MobileDataDialogFragment.java | 3 ++- .../settings/network/telephony/MobileDataSlice.java | 8 ++++---- .../telephony/SmsDefaultSubscriptionController.java | 2 +- .../telephony/MobileDataPreferenceControllerTest.java | 3 --- .../settings/network/telephony/MobileDataSliceTest.java | 3 ++- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/com/android/settings/network/telephony/CallsDefaultSubscriptionController.java b/src/com/android/settings/network/telephony/CallsDefaultSubscriptionController.java index 008a3e4929d..f1d1c609f6b 100644 --- a/src/com/android/settings/network/telephony/CallsDefaultSubscriptionController.java +++ b/src/com/android/settings/network/telephony/CallsDefaultSubscriptionController.java @@ -28,7 +28,7 @@ public class CallsDefaultSubscriptionController extends DefaultSubscriptionContr @Override protected SubscriptionInfo getDefaultSubscriptionInfo() { - return mManager.getDefaultVoiceSubscriptionInfo(); + return mManager.getActiveSubscriptionInfo(getDefaultSubscriptionId()); } @Override diff --git a/src/com/android/settings/network/telephony/MobileDataDialogFragment.java b/src/com/android/settings/network/telephony/MobileDataDialogFragment.java index a6183e96a5b..c8a1e985333 100644 --- a/src/com/android/settings/network/telephony/MobileDataDialogFragment.java +++ b/src/com/android/settings/network/telephony/MobileDataDialogFragment.java @@ -86,7 +86,8 @@ public class MobileDataDialogFragment extends InstrumentedDialogFragment impleme final SubscriptionInfo currentSubInfo = mSubscriptionManager.getActiveSubscriptionInfo(mSubId); final SubscriptionInfo nextSubInfo = - mSubscriptionManager.getDefaultDataSubscriptionInfo(); + mSubscriptionManager.getActiveSubscriptionInfo( + mSubscriptionManager.getDefaultDataSubscriptionId()); final String previousName = (nextSubInfo == null) ? getContext().getResources().getString( diff --git a/src/com/android/settings/network/telephony/MobileDataSlice.java b/src/com/android/settings/network/telephony/MobileDataSlice.java index c70ae1a89da..40c747c1112 100644 --- a/src/com/android/settings/network/telephony/MobileDataSlice.java +++ b/src/com/android/settings/network/telephony/MobileDataSlice.java @@ -147,8 +147,8 @@ public class MobileDataSlice implements CustomSliceable { } protected static int getDefaultSubscriptionId(SubscriptionManager subscriptionManager) { - final SubscriptionInfo defaultSubscription = - subscriptionManager.getDefaultDataSubscriptionInfo(); + final SubscriptionInfo defaultSubscription = subscriptionManager.getActiveSubscriptionInfo( + subscriptionManager.getDefaultDataSubscriptionId()); if (defaultSubscription == null) { return SubscriptionManager.INVALID_SUBSCRIPTION_ID; // No default subscription } @@ -157,8 +157,8 @@ public class MobileDataSlice implements CustomSliceable { } private CharSequence getSummary() { - final SubscriptionInfo defaultSubscription = - mSubscriptionManager.getDefaultDataSubscriptionInfo(); + final SubscriptionInfo defaultSubscription = mSubscriptionManager.getActiveSubscriptionInfo( + mSubscriptionManager.getDefaultDataSubscriptionId()); if (defaultSubscription == null) { return null; // no summary text } diff --git a/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java b/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java index b9992199ff7..96ed77167bd 100644 --- a/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java +++ b/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java @@ -28,7 +28,7 @@ public class SmsDefaultSubscriptionController extends DefaultSubscriptionControl @Override protected SubscriptionInfo getDefaultSubscriptionInfo() { - return mManager.getDefaultSmsSubscriptionInfo(); + return mManager.getActiveSubscriptionInfo(getDefaultSubscriptionId()); } @Override diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java index 1a11c49bc7b..d2ca4730c5c 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java @@ -98,7 +98,6 @@ public class MobileDataPreferenceControllerTest { public void isDialogNeeded_disableSingleSim_returnFalse() { doReturn(true).when(mTelephonyManager).isDataEnabled(); doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID); - doReturn(mSubscriptionInfo).when(mSubscriptionManager).getDefaultDataSubscriptionInfo(); doReturn(1).when(mTelephonyManager).getActiveModemCount(); assertThat(mController.isDialogNeeded()).isFalse(); @@ -130,7 +129,6 @@ public class MobileDataPreferenceControllerTest { public void onPreferenceChange_singleSim_On_shouldEnableData() { doReturn(true).when(mTelephonyManager).isDataEnabled(); doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID); - doReturn(mSubscriptionInfo).when(mSubscriptionManager).getDefaultDataSubscriptionInfo(); doReturn(1).when(mTelephonyManager).getActiveModemCount(); mController.onPreferenceChange(mPreference, true); @@ -142,7 +140,6 @@ public class MobileDataPreferenceControllerTest { public void onPreferenceChange_multiSim_On_shouldEnableData() { doReturn(true).when(mTelephonyManager).isDataEnabled(); doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID); - doReturn(mSubscriptionInfo).when(mSubscriptionManager).getDefaultDataSubscriptionInfo(); doReturn(2).when(mTelephonyManager).getActiveModemCount(); mController.onPreferenceChange(mPreference, true); diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileDataSliceTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileDataSliceTest.java index c66f75f02a6..4cc8f36bb02 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/MobileDataSliceTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/MobileDataSliceTest.java @@ -19,6 +19,7 @@ package com.android.settings.network.telephony; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; @@ -76,7 +77,7 @@ public class MobileDataSliceTest { doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE); doReturn(mSubscriptionManager).when(mContext).getSystemService(SubscriptionManager.class); doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID); - doReturn(mSubscriptionInfo).when(mSubscriptionManager).getDefaultDataSubscriptionInfo(); + doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(anyInt()); doReturn(SUB_ID).when(mSubscriptionInfo).getSubscriptionId(); doReturn(new ArrayList<>(Arrays.asList(mSubscriptionInfo))) .when(mSubscriptionManager).getSelectableSubscriptionInfoList();