Merge change 6317 into donut

* changes:
  Make enable/provisioning of the backup service a two-step process

core/java/android/backup/IBackupManager.aidl

@@ -72,6 +72,13 @@ interface IBackupManager {
      */
     void setBackupEnabled(boolean isEnabled);
 
+    /**
+     * Indicate that any necessary one-time provisioning has occurred.
+     *
+     * <p>Callers must hold the android.permission.BACKUP permission to use this method.
+     */
+    void setBackupProvisioned(boolean isProvisioned);
+
     /**
      * Report whether the backup mechanism is currently enabled.
      *

core/java/android/provider/Settings.java

@@ -2269,12 +2269,19 @@ public final class Settings {
         public static final String USE_LOCATION_FOR_SERVICES = "use_location";
 
         /**
-         * Controls whether data backup is enabled.
+         * Controls whether settings backup is enabled.
          * Type: int ( 0 = disabled, 1 = enabled )
          * @hide
          */
         public static final String BACKUP_ENABLED = "backup_enabled";
 
+        /**
+         * Indicates whether settings backup has been fully provisioned.
+         * Type: int ( 0 = unprovisioned, 1 = fully provisioned )
+         * @hide
+         */
+        public static final String BACKUP_PROVISIONED = "backup_provisioned";
+
         /**
          * Component of the transport to use for backup/restore.
          * @hide