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

[Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.3

Browse Source 
Test: atest DefaultSubscriptionControllerTest, NetworkProviderSettingsTest
Bug: 197066557
Change-Id: I7d29b58ca5476ae0bb6fe2e04fecb96164cb1ada
This commit is contained in:
Zoey Chen
2021-11-15 22:24:03 +08:00
parent 439bc7f9dd
commit e714654c94
7 changed files with 15 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/network/telephony/DefaultSubscriptionController.java
View File

@@ -94,12 +94,7 @@ public abstract class DefaultSubscriptionController extends TelephonyBasePrefere
@Override
public int getAvailabilityStatus(int subId) {
final List<SubscriptionInfo> subs = SubscriptionUtil.getActiveSubscriptions(mManager);
if (subs.size() > 1 || Utils.isProviderModelEnabled(mContext)) {
return AVAILABLE;
} else {
return CONDITIONALLY_UNAVAILABLE;
}
return AVAILABLE;
}
@OnLifecycleEvent(ON_RESUME)
@@ -162,7 +157,7 @@ public abstract class DefaultSubscriptionController extends TelephonyBasePrefere
final ArrayList<CharSequence> displayNames = new ArrayList<>();
final ArrayList<CharSequence> subscriptionIds = new ArrayList<>();
if (Utils.isProviderModelEnabled(mContext) && subs.size() == 1) {
if (subs.size() == 1) {
mPreference.setEnabled(false);
mPreference.setSummary(SubscriptionUtil.getUniqueSubscriptionDisplayName(
subs.get(0), mContext));
@@ -190,6 +185,7 @@ public abstract class DefaultSubscriptionController extends TelephonyBasePrefere
subscriptionIds.add(Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID));
}
mPreference.setEnabled(true);
mPreference.setEntries(displayNames.toArray(new CharSequence[0]));
mPreference.setEntryValues(subscriptionIds.toArray(new CharSequence[0]));