[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
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
Reference in New Issue
Block a user