Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add settings for SUW data control." into nyc-dev

Browse Source
This commit is contained in:
Robert Greenwalt
2016-04-11 21:27:59 +00:00
committed by Android (Google) Code Review
parent 7c0393abdf beb482cf89
commit 6e1e880f00
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/provider/Settings.java
View File

@@ -6665,6 +6665,17 @@ public final class Settings {
*/ */
public static final String DEVICE_PROVISIONED = "device_provisioned"; public static final String DEVICE_PROVISIONED = "device_provisioned";
/**
* Whether mobile data should be allowed while the device is being provisioned.
* This allows the provisioning process to turn off mobile data before the user
* has an opportunity to set things up, preventing other processes from burning
* precious bytes before wifi is setup.
* (0 = false, 1 = true)
* @hide
*/
public static final String DEVICE_PROVISIONING_MOBILE_DATA_ENABLED =
"device_provisioning_mobile_data";
/** /**
* The saved value for WindowManagerService.setForcedDisplaySize(). * The saved value for WindowManagerService.setForcedDisplaySize().
* Two integers separated by a comma. If unset, then use the real display size. * Two integers separated by a comma. If unset, then use the real display size.

1
telephony/java/com/android/internal/telephony/DctConstants.java
View File

@@ -102,6 +102,7 @@ public class DctConstants {
public static final int CMD_NET_STAT_POLL = BASE + 40; public static final int CMD_NET_STAT_POLL = BASE + 40;
public static final int EVENT_DATA_RAT_CHANGED = BASE + 41; public static final int EVENT_DATA_RAT_CHANGED = BASE + 41;
public static final int CMD_CLEAR_PROVISIONING_SPINNER = BASE + 42; public static final int CMD_CLEAR_PROVISIONING_SPINNER = BASE + 42;
public static final int EVENT_DEVICE_PROVISIONED_CHANGE = BASE + 43;
/***** Constants *****/ /***** Constants *****/