Merge "Establish permanently unavailable settings"

2018-05-09 18:14:32 +00:00
parent c0e0262f9c f87a1f3f41
commit 02ec86a17b
113 changed files with 185 additions and 207 deletions
--- a/tests/robotests/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceControllerTest.java
@@ -72,7 +72,7 @@ public class EnterpriseDisclosurePreferenceControllerTest {
        doReturn(null).when(mController).getDisclosure();

        assertThat(mController.getAvailabilityStatus()).isEqualTo(
-                BasePreferenceController.DISABLED_UNSUPPORTED);
+                BasePreferenceController.UNSUPPORTED_ON_DEVICE);
    }

    @Test