diff --git a/res/values/config.xml b/res/values/config.xml index cd17ee0eb88..6d9d784cb84 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -387,6 +387,9 @@ true + + true + true diff --git a/src/com/android/settings/network/InternetPreferenceController.java b/src/com/android/settings/network/InternetPreferenceController.java index 1f5042fc917..aed44d531e5 100644 --- a/src/com/android/settings/network/InternetPreferenceController.java +++ b/src/com/android/settings/network/InternetPreferenceController.java @@ -180,7 +180,7 @@ public class InternetPreferenceController extends AbstractPreferenceController i @Override public boolean isAvailable() { - return true; + return mContext.getResources().getBoolean(R.bool.config_show_internet_settings); } @Override diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java index 0bc426c9887..5c639ed4580 100644 --- a/src/com/android/settings/network/NetworkProviderSettings.java +++ b/src/com/android/settings/network/NetworkProviderSettings.java @@ -295,6 +295,12 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment @Override public void onCreate(Bundle icicle) { super.onCreate(icicle); + final Context context = getContext(); + if (context != null && !context.getResources().getBoolean( + R.bool.config_show_internet_settings)) { + finish(); + return; + } mAirplaneModeEnabler = new AirplaneModeEnabler(getContext(), this); // TODO(b/37429702): Add animations and preference comparator back after initial screen is diff --git a/tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java index 4ba12cbd769..8a4acd28f38 100644 --- a/tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java @@ -49,6 +49,7 @@ import androidx.test.annotation.UiThreadTest; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; +import com.android.settings.R; import com.android.settings.testutils.ResourcesUtils; import com.android.settings.wifi.WifiPickerTrackerHelper; import com.android.settings.wifi.WifiSummaryUpdater; @@ -188,8 +189,9 @@ public class InternetPreferenceControllerTest { } @Test - public void isAvailable_shouldBeTrue() { - assertThat(mController.isAvailable()).isTrue(); + public void isAvailable_shouldMatchPrefFlag() { + assertThat(mController.isAvailable()).isEqualTo( + mContext.getResources().getBoolean(R.bool.config_show_internet_settings)); } @Test