diff options
| author | 2016-06-23 16:42:15 +0000 | |
|---|---|---|
| committer | 2016-06-23 16:42:16 +0000 | |
| commit | d4ac4c7786787384029b9b73de31e74617eced3d (patch) | |
| tree | dc0a85264518857fd92ebb029e34691d5c51e96d | |
| parent | 9ee8f8066c15f7d4977a26d624baca1210666026 (diff) | |
| parent | 95a6c899d6625ec2b1a0cdca4934debff88da86d (diff) | |
Merge "Add global settings for cell radio state" into nyc-mr1-dev
| -rwxr-xr-x | core/java/android/provider/Settings.java | 6 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/PhoneConstants.java | 10 |
2 files changed, 16 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index ca45e62acf58..c531954b23a0 100755 --- 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"; } /** diff --git a/telephony/java/com/android/internal/telephony/PhoneConstants.java b/telephony/java/com/android/internal/telephony/PhoneConstants.java index 1680fe33ead7..b417a1c9e206 100644 --- a/telephony/java/com/android/internal/telephony/PhoneConstants.java +++ b/telephony/java/com/android/internal/telephony/PhoneConstants.java @@ -208,4 +208,14 @@ public class PhoneConstants { public static final int AUTH_CONTEXT_EAP_SIM = 128; public static final int AUTH_CONTEXT_EAP_AKA = 129; public static final int AUTH_CONTEXT_UNDEFINED = -1; + + /** + * Value for the global property CELL_ON + * 0: Cell radio is off + * 1: Cell radio is on + * 2: Cell radio is off because airplane mode is enabled + */ + public static final int CELL_OFF_FLAG = 0; + public static final int CELL_ON_FLAG = 1; + public static final int CELL_OFF_DUE_TO_AIRPLANE_MODE_FLAG = 2; } |