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

Commit c69acaef authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "New global setting for developer options."

parents bc18f289 895f99e9

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -17505,6 +17505,7 @@ package android.provider { 
    field public static final android.net.Uri CONTENT_URI;

    field public static final java.lang.String DATA_ROAMING = "data_roaming";

    field public static final java.lang.String DEFAULT_INPUT_METHOD = "default_input_method";

    field public static final java.lang.String DEVELOPMENT_SETTINGS_ENABLED = "development_settings_enabled";

    field public static final java.lang.String DEVICE_PROVISIONED = "device_provisioned";

    field public static final java.lang.String ENABLED_ACCESSIBILITY_SERVICES = "enabled_accessibility_services";

    field public static final java.lang.String ENABLED_INPUT_METHODS = "enabled_input_methods";

core/java/android/provider/Settings.java

+5 −0
Original line number Diff line number Diff line
@@ -2481,6 +2481,11 @@ public final class Settings { 
        public static final Uri CONTENT_URI =

            Uri.parse("content://" + AUTHORITY + "/secure");



        /**

         * Whether user has enabled development settings.

         */

        public static final String DEVELOPMENT_SETTINGS_ENABLED = "development_settings_enabled";



        /**

         * Whether ADB is enabled.

         */