diff options
| author | markchien <markchien@google.com> | 2020-06-03 23:08:10 +0800 |
|---|---|---|
| committer | markchien <markchien@google.com> | 2020-06-10 22:34:39 +0800 |
| commit | 92b09e825f852845d4c61db242e497a67334737f (patch) | |
| tree | fc51273ab245fe9c8583add16d87cfa542b6da4c /src/com/android/settings/network | |
| parent | e92cbd19d8f912fb22086e2961e10fc6280837de (diff) | |
| download | packages_apps_Settings-92b09e825f852845d4c61db242e497a67334737f.tar.gz packages_apps_Settings-92b09e825f852845d4c61db242e497a67334737f.tar.bz2 packages_apps_Settings-92b09e825f852845d4c61db242e497a67334737f.zip | |
Remove isProvisioningNeededButUnavailable usage
config_mobile_hotspot_provision_app would be move out of framework and
only private for tethering only. TetherUtil#isProvisioningNeeded and
isProvisioningNeededButUnavailable are no longer needed because
tethering would ensure entitlement app is valid if entitlement check is
needed. Otherwise, tethering would return not supported that tethering
settings would be hidden.
Bug: 146918263
Test: m
Change-Id: If0b0a3e6cadab3c4a4d2c003e2aa9e9f3dd7449c
Diffstat (limited to 'src/com/android/settings/network')
| -rw-r--r-- | src/com/android/settings/network/AllInOneTetherPreferenceController.java | 12 | ||||
| -rw-r--r-- | src/com/android/settings/network/TetherPreferenceController.java | 4 |
2 files changed, 0 insertions, 16 deletions
diff --git a/src/com/android/settings/network/AllInOneTetherPreferenceController.java b/src/com/android/settings/network/AllInOneTetherPreferenceController.java index 595e31bab0..8180d5a6ef 100644 --- a/src/com/android/settings/network/AllInOneTetherPreferenceController.java +++ b/src/com/android/settings/network/AllInOneTetherPreferenceController.java @@ -37,10 +37,8 @@ import androidx.lifecycle.Lifecycle; import androidx.lifecycle.Lifecycle.Event; import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.OnLifecycleEvent; -import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.TetherSettings; import com.android.settings.core.BasePreferenceController; import com.android.settings.core.FeatureFlags; import com.android.settings.widget.MasterSwitchController; @@ -96,16 +94,6 @@ public class AllInOneTetherPreferenceController extends BasePreferenceController } @Override - public void displayPreference(PreferenceScreen screen) { - super.displayPreference(screen); - mPreference = screen.findPreference(mPreferenceKey); - if (mPreference != null && !mAdminDisallowedTetherConfig) { - // Grey out if provisioning is not available. - mPreference.setEnabled(!TetherSettings.isProvisioningNeededButUnavailable(mContext)); - } - } - - @Override public int getAvailabilityStatus() { if (!TetherUtil.isTetherAvailable(mContext) || !FeatureFlagUtils.isEnabled(mContext, FeatureFlags.TETHER_ALL_IN_ONE)) { diff --git a/src/com/android/settings/network/TetherPreferenceController.java b/src/com/android/settings/network/TetherPreferenceController.java index d18d897393..2409544216 100644 --- a/src/com/android/settings/network/TetherPreferenceController.java +++ b/src/com/android/settings/network/TetherPreferenceController.java @@ -40,7 +40,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.TetherSettings; import com.android.settings.core.FeatureFlags; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.TetherUtil; @@ -108,9 +107,6 @@ public class TetherPreferenceController extends AbstractPreferenceController imp if (mPreference != null && !mAdminDisallowedTetherConfig) { mPreference.setTitle( com.android.settingslib.Utils.getTetheringLabel(mConnectivityManager)); - - // Grey out if provisioning is not available. - mPreference.setEnabled(!TetherSettings.isProvisioningNeededButUnavailable(mContext)); } } |