Merge \"Add global settings for cell radio state\" into nyc-mr1-dev

am: d4ac4c7786 Change-Id: I5698d08dcc6854ceffb08debecf3fa443750fab0
2016-06-23 16:56:04 +00:00
parent 2c0f1a8773 d4ac4c7786
commit 8bfefbbb53
2 changed files with 16 additions and 0 deletions
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -9074,6 +9074,12 @@ public final class Settings {
         */
        public static final String SYSTEM_NAVIGATION_KEYS_ENABLED =
                "system_navigation_keys_enabled";
+
+        /**
+         * Whether cell is enabled/disabled
+         * @hide
+         */
+        public static final String CELL_ON = "cell_on";
    }

    /**