diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java index bb539b7ae32..bae3cda36a6 100644 --- a/src/com/android/settings/network/NetworkProviderSettings.java +++ b/src/com/android/settings/network/NetworkProviderSettings.java @@ -60,7 +60,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.android.settings.AirplaneModeEnabler; import com.android.settings.R; import com.android.settings.RestrictedSettingsFragment; -import com.android.settings.Utils; import com.android.settings.core.FeatureFlags; import com.android.settings.core.SubSettingLauncher; import com.android.settings.datausage.DataUsagePreference; @@ -279,17 +278,6 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment @Override public void onCreate(Bundle icicle) { super.onCreate(icicle); - if (!Utils.isProviderModelEnabled(getContext())) { - final Intent intent = new Intent(getContext(), WifiSettingsActivity.class); - final Bundle extras = getActivity().getIntent().getExtras(); - if (extras != null) { - intent.putExtras(extras); - } - getContext().startActivity(intent); - finish(); - return; - } - mAirplaneModeEnabler = new AirplaneModeEnabler(getContext(), this); // TODO(b/37429702): Add animations and preference comparator back after initial screen is @@ -1187,10 +1175,6 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.network_provider_settings) { - @Override - protected boolean isPageSearchEnabled(Context context) { - return Utils.isProviderModelEnabled(context); - } @Override public List getNonIndexableKeys(Context context) { diff --git a/src/com/android/settings/network/VpnPreferenceController.java b/src/com/android/settings/network/VpnPreferenceController.java index 4944f4380a2..96931e638fc 100644 --- a/src/com/android/settings/network/VpnPreferenceController.java +++ b/src/com/android/settings/network/VpnPreferenceController.java @@ -156,7 +156,7 @@ public class VpnPreferenceController extends AbstractPreferenceController summary = getNameForVpnConfig(vpn, UserHandle.of(uid)); } // Optionally add warning icon if an insecure VPN is present. - if (Utils.isProviderModelEnabled(mContext) && mPreference instanceof VpnInfoPreference) { + if (mPreference instanceof VpnInfoPreference) { final int insecureVpnCount = getInsecureVpnCount(); boolean isInsecureVPN = insecureVpnCount > 0; ((VpnInfoPreference) mPreference).setInsecureVpn(isInsecureVPN); diff --git a/src/com/android/settings/network/telephony/CallsDefaultSubscriptionController.java b/src/com/android/settings/network/telephony/CallsDefaultSubscriptionController.java index 16ac8f7ab4e..b8e29118c05 100644 --- a/src/com/android/settings/network/telephony/CallsDefaultSubscriptionController.java +++ b/src/com/android/settings/network/telephony/CallsDefaultSubscriptionController.java @@ -45,10 +45,6 @@ public class CallsDefaultSubscriptionController extends DefaultSubscriptionContr @Override public CharSequence getSummary() { - if (Utils.isProviderModelEnabled(mContext)) { - return MobileNetworkUtils.getPreferredStatus(isRtlMode(), mContext, mManager, true); - } else { - return super.getSummary(); - } + return MobileNetworkUtils.getPreferredStatus(isRtlMode(), mContext, mManager, true); } } diff --git a/src/com/android/settings/network/telephony/DefaultSubscriptionController.java b/src/com/android/settings/network/telephony/DefaultSubscriptionController.java index d21d584a71c..168e69df2b2 100644 --- a/src/com/android/settings/network/telephony/DefaultSubscriptionController.java +++ b/src/com/android/settings/network/telephony/DefaultSubscriptionController.java @@ -94,12 +94,7 @@ public abstract class DefaultSubscriptionController extends TelephonyBasePrefere @Override public int getAvailabilityStatus(int subId) { - final List 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 displayNames = new ArrayList<>(); final ArrayList 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])); diff --git a/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java b/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java index a73c62116a9..68ebe84c7b1 100644 --- a/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java +++ b/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java @@ -61,10 +61,6 @@ public class SmsDefaultSubscriptionController extends DefaultSubscriptionControl @Override public CharSequence getSummary() { - if (Utils.isProviderModelEnabled(mContext)) { - return MobileNetworkUtils.getPreferredStatus(isRtlMode(), mContext, mManager, false); - } else { - return super.getSummary(); - } + return MobileNetworkUtils.getPreferredStatus(isRtlMode(), mContext, mManager, false); } } diff --git a/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java b/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java index be8bf3a1d33..31b6f271658 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java @@ -158,7 +158,6 @@ public class NetworkProviderSettingsTest { .when(mFirstWifiEntryPreferenceCategory).getKey(); mNetworkProviderSettings.mFirstWifiEntryPreferenceCategory = mFirstWifiEntryPreferenceCategory; - FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, false); } @Test diff --git a/tests/unit/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java index 93621d96119..c48941fa794 100644 --- a/tests/unit/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java +++ b/tests/unit/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java @@ -89,13 +89,6 @@ public class DefaultSubscriptionControllerTest { SubscriptionUtil.setActiveSubscriptionsForTesting(null); } - @Test - public void getAvailabilityStatus_onlyOneSubscription_notAvailable() { - SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList( - createMockSub(1, "sub1"))); - assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE); - } - @Test public void getAvailabilityStatus_twoSubscriptions_isAvailable() { SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList( @@ -248,7 +241,7 @@ public class DefaultSubscriptionControllerTest { mController.setDefaultSubscription(sub1.getSubscriptionId()); mController.displayPreference(mScreen); - assertThat(mController.isAvailable()).isFalse(); + assertThat(mController.isAvailable()).isTrue(); // Now make two subs be active - the pref should become available, and the // onPreferenceChange callback should be properly wired up. @@ -289,12 +282,14 @@ public class DefaultSubscriptionControllerTest { mController.displayPreference(mScreen); assertThat(mController.isAvailable()).isTrue(); assertThat(mListPreference.isVisible()).isTrue(); + assertThat(mListPreference.isEnabled()).isTrue(); SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1)); mController.onSubscriptionsChanged(); - assertThat(mController.isAvailable()).isFalse(); - assertThat(mListPreference.isVisible()).isFalse(); + assertThat(mController.isAvailable()).isTrue(); + assertThat(mListPreference.isVisible()).isTrue(); + assertThat(mListPreference.isEnabled()).isFalse(); } @Test @@ -306,8 +301,9 @@ public class DefaultSubscriptionControllerTest { mController.setDefaultSubscription(sub1.getSubscriptionId()); mController.displayPreference(mScreen); - assertThat(mController.isAvailable()).isFalse(); - assertThat(mListPreference.isVisible()).isFalse(); + assertThat(mController.isAvailable()).isTrue(); + assertThat(mListPreference.isVisible()).isTrue(); + assertThat(mListPreference.isEnabled()).isFalse(); SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2)); when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(sub1, sub2)); @@ -315,6 +311,7 @@ public class DefaultSubscriptionControllerTest { assertThat(mController.isAvailable()).isTrue(); assertThat(mListPreference.isVisible()).isTrue(); + assertThat(mListPreference.isEnabled()).isTrue(); } @Test