[automerger] Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc). am: 20e5d92613 am: c1ec4d...

am: 5f619835ed

Change-Id: Ie2c9fb05e3245f3045f3c9a4919760e70285fa37

diff --cc core/java/android/provider/Settings.java
index 501d7f1,a5ee9c8..41750fd
mode 100644,100755..100644
--- 1/core/java/android/provider/Settings.java
--- 2/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@@ -5486,87 -5288,19 +5486,99 @@@ public final class Settings 
           *
           * @hide
           */
 -        public static final String TV_USER_SETUP_COMPLETE = "tv_user_setup_complete";
 +        @SystemApi
 +        @TestApi
 +        public static final String AUTOFILL_USER_DATA_MAX_FIELD_CLASSIFICATION_IDS_SIZE =
 +                "autofill_user_data_max_field_classification_size";
  
          /**
 -         * Prefix for category name that marks whether a suggested action from that category was
 -         * completed.
 +         * Defines value returned by
 +         * {@link android.service.autofill.UserData#getMaxCategoryCount()}.
 +         *
           * @hide
           */
 -        public static final String COMPLETED_CATEGORY_PREFIX = "suggested.completed_category.";
 +        @SystemApi
 +        @TestApi
 +        public static final String AUTOFILL_USER_DATA_MAX_CATEGORY_COUNT =
 +                "autofill_user_data_max_category_count";
  
          /**
 -         * List of input methods that are currently enabled.  This is a string
 -         * containing the IDs of all enabled input methods, each ID separated
 +         * Defines value returned by {@link android.service.autofill.UserData#getMaxValueLength()}.
 +         *
 +         * @hide
 +         */
 +        @SystemApi
 +        @TestApi
 +        public static final String AUTOFILL_USER_DATA_MAX_VALUE_LENGTH =
 +                "autofill_user_data_max_value_length";
 +
 +        /**
 +         * Defines value returned by {@link android.service.autofill.UserData#getMinValueLength()}.
 +         *
 +         * @hide
 +         */
 +        @SystemApi
 +        @TestApi
 +        public static final String AUTOFILL_USER_DATA_MIN_VALUE_LENGTH =
 +                "autofill_user_data_min_value_length";
 +
 +        /**
 +         * @deprecated Use {@link android.provider.Settings.Global#DEVICE_PROVISIONED} instead
 +         */
 +        @Deprecated
 +        public static final String DEVICE_PROVISIONED = Global.DEVICE_PROVISIONED;
 +
 +        /**
++         * Indicates whether a DPC has been downloaded during provisioning.
++         *
++         * <p>Type: int (0 for false, 1 for true)
++         *
++         * <p>If this is true, then any attempts to begin setup again should result in factory reset
++         *
++         * @hide
++         */
++        public static final String MANAGED_PROVISIONING_DPC_DOWNLOADED =
++                "managed_provisioning_dpc_downloaded";
++
++        /**
 +         * Whether the current user has been set up via setup wizard (0 = false, 1 = true)
 +         * @hide
 +         */
 +        @TestApi
 +        public static final String USER_SETUP_COMPLETE = "user_setup_complete";
 +
 +        /**
 +         * The current state of device personalization.
 +         *
 +         * @hide
 +         * @see UserSetupPersonalization
 +         */
 +        public static final String USER_SETUP_PERSONALIZATION_STATE =
 +                "user_setup_personalization_state";
 +
 +        /**
 +         * Whether the current user has been set up via setup wizard (0 = false, 1 = true)
 +         * This value differs from USER_SETUP_COMPLETE in that it can be reset back to 0
 +         * in case SetupWizard has been re-enabled on TV devices.
 +         *
 +         * @hide
 +         */
 +        public static final String TV_USER_SETUP_COMPLETE = "tv_user_setup_complete";
 +
 +        /**
 +         * Prefix for category name that marks whether a suggested action from that category was
 +         * completed.
 +         * @hide
 +         */
 +        public static final String COMPLETED_CATEGORY_PREFIX = "suggested.completed_category.";
 +
 +        /**
 +         * List of input methods that are currently enabled.  This is a string
 +         * containing the IDs of all enabled input methods, each ID separated
           * by ':'.
 +         *
 +         * Format like "ime0;subtype0;subtype1;subtype2:ime1:ime2;subtype0"
 +         * where imeId is ComponentName and subtype is int32.
           */
          public static final String ENABLED_INPUT_METHODS = "enabled_input_methods";