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

[Mainline] To use getActiveSubscriptionInfo() instead of get default subscription Info with data/sms/voice

Browse Source 
- 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
This commit is contained in:
changbetty
2020-01-08 19:05:19 +08:00
parent 6b7b92ced5
commit a8d56184c3
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,11 +159,12 @@ public final class DataUsageUtils extends com.android.settingslib.net.DataUsageU
* SubscriptionManager#INVALID_SUBSCRIPTION_ID
*/
public static int getDefaultSubscriptionId(Context context) {
SubscriptionManager subManager = SubscriptionManager.from(context);
SubscriptionManager subManager = context.getSystemService(SubscriptionManager.class);
if (subManager == null) {
return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
}
SubscriptionInfo subscriptionInfo = subManager.getDefaultDataSubscriptionInfo();
SubscriptionInfo subscriptionInfo =
subManager.getActiveSubscriptionInfo(subManager.getDefaultDataSubscriptionId());
if (subscriptionInfo == null) {
List<SubscriptionInfo> list = subManager.getAllSubscriptionInfoList();
if (list.size() == 0) {

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

@@ -28,7 +28,7 @@ public class CallsDefaultSubscriptionController extends DefaultSubscriptionContr
@Override
protected SubscriptionInfo getDefaultSubscriptionInfo() {
return mManager.getDefaultVoiceSubscriptionInfo();
return mManager.getActiveSubscriptionInfo(getDefaultSubscriptionId());
}
@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 =
mSubscriptionManager.getActiveSubscriptionInfo(mSubId);
final SubscriptionInfo nextSubInfo =
mSubscriptionManager.getDefaultDataSubscriptionInfo();
mSubscriptionManager.getActiveSubscriptionInfo(
mSubscriptionManager.getDefaultDataSubscriptionId());
final String previousName = (nextSubInfo == null)
? 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) {
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
}

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

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