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

Commit 8e4f6fbc authored by Russell Brenner's avatar Russell Brenner Committed by android-build-merger
Browse files

Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3 

am: afe5eada

* commit 'afe5eada':
  Block developer settings during SUW
parents 6967df64 afe5eada

src/com/android/settings/DevelopmentSettings.java

+5 −1
Original line number Original line Diff line number Diff line
@@ -259,7 +259,11 @@ public class DevelopmentSettings extends SettingsPreferenceFragment 
        mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);

        mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);





        if (android.os.Process.myUserHandle().getIdentifier() != UserHandle.USER_OWNER

        if (android.os.Process.myUserHandle().getIdentifier() != UserHandle.USER_OWNER

                || mUm.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES)) {

                || mUm.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES)

                || Settings.Global.getInt(getActivity().getContentResolver(),

                        Settings.Global.DEVICE_PROVISIONED, 0) == 0) {

            // Block access to developer options if the user is not the owner, if user policy

            // restricts it, or if the device has not been provisioned

            mUnavailable = true;

            mUnavailable = true;

            setPreferenceScreen(new PreferenceScreen(getActivity(), null));

            setPreferenceScreen(new PreferenceScreen(getActivity(), null));

            return;

            return;

src/com/android/settings/DeviceInfoSettings.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -209,6 +209,12 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In 
            // Don't enable developer options for secondary users.

            // Don't enable developer options for secondary users.

            if (UserHandle.myUserId() != UserHandle.USER_OWNER) return true;

            if (UserHandle.myUserId() != UserHandle.USER_OWNER) return true;





            // Don't enable developer options until device has been provisioned

            if (Settings.Global.getInt(getActivity().getContentResolver(),

                    Settings.Global.DEVICE_PROVISIONED, 0) == 0) {

                return true;

            }



            final UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);

            final UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);

            if (um.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES)) return true;

            if (um.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES)) return true;