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

Commit 97b7e38a authored by Romain Hunault's avatar Romain Hunault
Browse files

Merge branch 'cm-14.1' into eelo-0.1

parents 8012faf7 5e860f67

src/com/android/settings/DevelopmentSettings.java

+4 −4
Original line number Diff line number Diff line
@@ -947,8 +947,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 
        String oldValue = SystemProperties.get(ROOT_ACCESS_PROPERTY, "0");

        SystemProperties.set(ROOT_ACCESS_PROPERTY, newValue.toString());

        if (Integer.valueOf(newValue.toString()) < 2 && !oldValue.equals(newValue)

                && "1".equals(SystemProperties.get("service.adb.root", "0"))) {

            SystemProperties.set("service.adb.root", "0");

                && "1".equals(SystemProperties.get("cm.service.adb.root", "0"))) {

            SystemProperties.set("cm.service.adb.root", "0");

            Settings.Secure.putInt(getActivity().getContentResolver(),

                    Settings.Secure.ADB_ENABLED, 0);

            Settings.Secure.putInt(getActivity().getContentResolver(),
@@ -965,8 +965,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 
    private void resetRootAccessOptions() {

        String oldValue = SystemProperties.get(ROOT_ACCESS_PROPERTY, "0");

        SystemProperties.set(ROOT_ACCESS_PROPERTY, "0");

        if (!oldValue.equals("0") && "1".equals(SystemProperties.get("service.adb.root", "0"))) {

            SystemProperties.set("service.adb.root", "0");

        if (!oldValue.equals("0") && "1".equals(SystemProperties.get("cm.service.adb.root", "0"))) {

            SystemProperties.set("cm.service.adb.root", "0");

            Settings.Secure.putInt(getActivity().getContentResolver(),

                    Settings.Secure.ADB_ENABLED, 0);

            Settings.Secure.putInt(getActivity().getContentResolver(),