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

Commit ad1f6a7b authored by Robert Greenwalt's avatar Robert Greenwalt Committed by android-build-merger
Browse files

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

am: 6e1e880f

* commit '6e1e880f':
  Add settings for SUW data control.

Change-Id: I9a919ae9d8a960fa1540f051221643a5af3307c4
parents c0b5c1c8 6e1e880f

core/java/android/provider/Settings.java

+11 −0
Original line number Diff line number Diff line
@@ -6665,6 +6665,17 @@ public final class Settings { 
        */

       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().

        * Two integers separated by a comma.  If unset, then use the real display size.

telephony/java/com/android/internal/telephony/DctConstants.java

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ public class DctConstants { 
    public static final int CMD_NET_STAT_POLL = BASE + 40;

    public static final int EVENT_DATA_RAT_CHANGED = BASE + 41;

    public static final int CMD_CLEAR_PROVISIONING_SPINNER = BASE + 42;

    public static final int EVENT_DEVICE_PROVISIONED_CHANGE = BASE + 43;



    /***** Constants *****/