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

Test: atest CarrierWifiTogglePreferenceControllerTest
Bug: 197066557
Change-Id: I2f1d22fb77c4e56ed10e11dfe11e8b9e880f16ff
This commit is contained in:
Zoey Chen
2021-11-15 21:59:46 +08:00
parent 5515e9bde5
commit 439bc7f9dd
6 changed files with 19 additions and 55 deletions

View File

@@ -39,7 +39,6 @@ public class CarrierWifiTogglePreferenceController extends TogglePreferenceContr
protected static final String CARRIER_WIFI_NETWORK_PREF_KEY = "carrier_wifi_network";
protected final Context mContext;
protected boolean mIsProviderModelEnabled;
protected int mSubId;
protected WifiPickerTrackerHelper mWifiPickerTrackerHelper;
protected boolean mIsCarrierProvisionWifiEnabled;
@@ -49,7 +48,6 @@ public class CarrierWifiTogglePreferenceController extends TogglePreferenceContr
String preferenceKey) {
super(context, preferenceKey);
mContext = context;
mIsProviderModelEnabled = Utils.isProviderModelEnabled(context);
}
/** Initialize related properties */
@@ -62,9 +60,6 @@ public class CarrierWifiTogglePreferenceController extends TogglePreferenceContr
@Override
public int getAvailabilityStatus() {
if (!mIsProviderModelEnabled) {
return CONDITIONALLY_UNAVAILABLE;
}
return mIsCarrierProvisionWifiEnabled ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}