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

Commit 23e7dd87 authored by Russell Brenner's avatar Russell Brenner
Browse files

resolve merge conflicts of 54937973 to master. 

Change-Id: I8a6e83948a1915483567734fa99d903acf7e4754
parents 1f8bd6f4 54937973

src/com/android/settings/DevelopmentSettings.java

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

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





        if (!mUm.isAdminUser()

        if (!mUm.isAdminUser()

                || 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(getPrefContext(), null));

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

            return;

            return;

src/com/android/settings/DeviceInfoSettings.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -208,6 +208,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 (!mUm.isAdminUser()) return true;

            if (!mUm.isAdminUser()) 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;

            }



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

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





            if (mDevHitCountdown > 0) {

            if (mDevHitCountdown > 0) {