diff options
author | Erik Kline <ek@google.com> | 2015-05-08 07:27:27 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-08 07:27:30 +0000 |
commit | a0698b617f1efc71d5301f98aead822e266ec5d6 (patch) | |
tree | 60d57dd9dc6634e66f35fb3d70847cf7cdd157ed /core | |
parent | 03fdca1b29aff07583b7764b7b359cbbfc58e577 (diff) | |
parent | da4bfa81cdaccdc65d4812c81c892926cd0c9884 (diff) | |
download | frameworks_base-a0698b617f1efc71d5301f98aead822e266ec5d6.zip frameworks_base-a0698b617f1efc71d5301f98aead822e266ec5d6.tar.gz frameworks_base-a0698b617f1efc71d5301f98aead822e266ec5d6.tar.bz2 |
Merge "Optionally add a default MOBILE request." into mnc-dev
Diffstat (limited to 'core')
-rw-r--r-- | core/java/android/provider/Settings.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index a7af838..7c3c11b 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -6156,6 +6156,17 @@ public final class Settings { */ public static final String MOBILE_DATA = "mobile_data"; + /** + * Whether the mobile data connection should remain active even when higher + * priority networks like WiFi are active, to help make network switching faster. + * + * See ConnectivityService for more info. + * + * (0 = disabled, 1 = enabled) + * @hide + */ + public static final String MOBILE_DATA_ALWAYS_ON = "mobile_data_always_on"; + /** {@hide} */ public static final String NETSTATS_ENABLED = "netstats_enabled"; /** {@hide} */ |