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

Merge "[Mainline] To use getActiveSubscriptionInfo() instead of get default subscription Info with data/sms/voice" am: 251329c85c am: 74d5ae043c

Browse Source 
Change-Id: Ief23331634bdccae49104db98193d0d842a7c99c
This commit is contained in:
Betty Chang
2020-02-17 07:01:23 +00:00
parent 3f23659639 74d5ae043c
commit 56235e44c5
6 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@ public class CallsDefaultSubscriptionController extends DefaultSubscriptionContr
@Override @Override
protected SubscriptionInfo getDefaultSubscriptionInfo() { protected SubscriptionInfo getDefaultSubscriptionInfo() {
return mManager.getDefaultVoiceSubscriptionInfo(); return mManager.getActiveSubscriptionInfo(getDefaultSubscriptionId());
} }
@Override @Override

3
src/com/android/settings/network/telephony/MobileDataDialogFragment.java
View File

@@ -86,7 +86,8 @@ public class MobileDataDialogFragment extends InstrumentedDialogFragment impleme
final SubscriptionInfo currentSubInfo = final SubscriptionInfo currentSubInfo =
mSubscriptionManager.getActiveSubscriptionInfo(mSubId); mSubscriptionManager.getActiveSubscriptionInfo(mSubId);
final SubscriptionInfo nextSubInfo = final SubscriptionInfo nextSubInfo =
mSubscriptionManager.getDefaultDataSubscriptionInfo(); mSubscriptionManager.getActiveSubscriptionInfo(
mSubscriptionManager.getDefaultDataSubscriptionId());
final String previousName = (nextSubInfo == null) final String previousName = (nextSubInfo == null)
? getContext().getResources().getString( ? getContext().getResources().getString(

8
src/com/android/settings/network/telephony/MobileDataSlice.java
View File

@@ -147,8 +147,8 @@ public class MobileDataSlice implements CustomSliceable {
} }
protected static int getDefaultSubscriptionId(SubscriptionManager subscriptionManager) { protected static int getDefaultSubscriptionId(SubscriptionManager subscriptionManager) {
final SubscriptionInfo defaultSubscription = final SubscriptionInfo defaultSubscription = subscriptionManager.getActiveSubscriptionInfo(
subscriptionManager.getDefaultDataSubscriptionInfo(); subscriptionManager.getDefaultDataSubscriptionId());
if (defaultSubscription == null) { if (defaultSubscription == null) {
return SubscriptionManager.INVALID_SUBSCRIPTION_ID; // No default subscription return SubscriptionManager.INVALID_SUBSCRIPTION_ID; // No default subscription
} }
@@ -157,8 +157,8 @@ public class MobileDataSlice implements CustomSliceable {
} }
private CharSequence getSummary() { private CharSequence getSummary() {
final SubscriptionInfo defaultSubscription = final SubscriptionInfo defaultSubscription = mSubscriptionManager.getActiveSubscriptionInfo(
mSubscriptionManager.getDefaultDataSubscriptionInfo(); mSubscriptionManager.getDefaultDataSubscriptionId());
if (defaultSubscription == null) { if (defaultSubscription == null) {
return null; // no summary text return null; // no summary text
} }

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

@@ -28,7 +28,7 @@ public class SmsDefaultSubscriptionController extends DefaultSubscriptionControl
@Override @Override
protected SubscriptionInfo getDefaultSubscriptionInfo() { protected SubscriptionInfo getDefaultSubscriptionInfo() {
return mManager.getDefaultSmsSubscriptionInfo(); return mManager.getActiveSubscriptionInfo(getDefaultSubscriptionId());
} }
@Override @Override

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

@@ -98,7 +98,6 @@ public class MobileDataPreferenceControllerTest {
public void isDialogNeeded_disableSingleSim_returnFalse() { public void isDialogNeeded_disableSingleSim_returnFalse() {
doReturn(true).when(mTelephonyManager).isDataEnabled(); doReturn(true).when(mTelephonyManager).isDataEnabled();
doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID); doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);
doReturn(mSubscriptionInfo).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
doReturn(1).when(mTelephonyManager).getActiveModemCount(); doReturn(1).when(mTelephonyManager).getActiveModemCount();
assertThat(mController.isDialogNeeded()).isFalse(); assertThat(mController.isDialogNeeded()).isFalse();
@@ -130,7 +129,6 @@ public class MobileDataPreferenceControllerTest {
public void onPreferenceChange_singleSim_On_shouldEnableData() { public void onPreferenceChange_singleSim_On_shouldEnableData() {
doReturn(true).when(mTelephonyManager).isDataEnabled(); doReturn(true).when(mTelephonyManager).isDataEnabled();
doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID); doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);
doReturn(mSubscriptionInfo).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
doReturn(1).when(mTelephonyManager).getActiveModemCount(); doReturn(1).when(mTelephonyManager).getActiveModemCount();
mController.onPreferenceChange(mPreference, true); mController.onPreferenceChange(mPreference, true);
@@ -142,7 +140,6 @@ public class MobileDataPreferenceControllerTest {
public void onPreferenceChange_multiSim_On_shouldEnableData() { public void onPreferenceChange_multiSim_On_shouldEnableData() {
doReturn(true).when(mTelephonyManager).isDataEnabled(); doReturn(true).when(mTelephonyManager).isDataEnabled();
doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID); doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);
doReturn(mSubscriptionInfo).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
doReturn(2).when(mTelephonyManager).getActiveModemCount(); doReturn(2).when(mTelephonyManager).getActiveModemCount();
mController.onPreferenceChange(mPreference, true); mController.onPreferenceChange(mPreference, true);

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

@@ -19,6 +19,7 @@ package com.android.settings.network.telephony;
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.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.times; import static org.mockito.Mockito.times;
@@ -76,7 +77,7 @@ public class MobileDataSliceTest {
doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE); doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
doReturn(mSubscriptionManager).when(mContext).getSystemService(SubscriptionManager.class); doReturn(mSubscriptionManager).when(mContext).getSystemService(SubscriptionManager.class);
doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID); 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(SUB_ID).when(mSubscriptionInfo).getSubscriptionId();
doReturn(new ArrayList<>(Arrays.asList(mSubscriptionInfo))) doReturn(new ArrayList<>(Arrays.asList(mSubscriptionInfo)))
.when(mSubscriptionManager).getSelectableSubscriptionInfoList(); .when(mSubscriptionManager).getSelectableSubscriptionInfoList();