Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae739a05 authored by Christine Franks's avatar Christine Franks Committed by Android (Google) Code Review
Browse files

Merge "Remove demo-specific developer options logic"

parents 80ef5a88 67e43ea7

packages/SettingsLib/src/com/android/settingslib/development/AbstractEnableAdbPreferenceController.java

+1 −2
Original line number Diff line number Diff line
@@ -59,8 +59,7 @@ public abstract class AbstractEnableAdbPreferenceController extends 


    @Override

    public boolean isAvailable() {

        final UserManager um = mContext.getSystemService(UserManager.class);

        return um != null && (um.isAdminUser() || um.isDemoUser());

        return mContext.getSystemService(UserManager.class).isAdminUser();

    }



    @Override

packages/SettingsLib/src/com/android/settingslib/development/DevelopmentSettingsEnabler.java

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ public class DevelopmentSettingsEnabler { 
                Build.TYPE.equals("eng") ? 1 : 0) != 0;

        final boolean hasRestriction = um.hasUserRestriction(

                UserManager.DISALLOW_DEBUGGING_FEATURES);

        final boolean isAdminOrDemo = um.isAdminUser() || um.isDemoUser();

        return isAdminOrDemo && !hasRestriction && settingEnabled;

        final boolean isAdmin = um.isAdminUser();

        return isAdmin && !hasRestriction && settingEnabled;

    }

}

packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/DevelopmentSettingsEnablerTest.java

+1 −12
Original line number Diff line number Diff line
@@ -73,22 +73,11 @@ public class DevelopmentSettingsEnablerTest { 
    }



    @Test

    public void isEnabled_settingsOn_noRestriction_notAdmin_notDemo_shouldReturnFalse() {

    public void isEnabled_settingsOn_noRestriction_notAdmin_shouldReturnFalse() {

        Settings.Global.putInt(mContext.getContentResolver(),

                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);

        ShadowUserManager.getShadow().setIsAdminUser(false);

        ShadowUserManager.getShadow().setIsDemoUser(false);



        assertThat(DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)).isFalse();

    }



    @Test

    public void isEnabled_settingsOn_noRestriction_notAdmin_isDemo_shouldReturnTrue() {

        Settings.Global.putInt(mContext.getContentResolver(),

            Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);

        ShadowUserManager.getShadow().setIsAdminUser(false);

        ShadowUserManager.getShadow().setIsDemoUser(true);



        assertThat(DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)).isTrue();

    }

}