diff options
| author | Julia Reynolds <juliacr@google.com> | 2017-08-15 14:43:00 -0400 |
|---|---|---|
| committer | Julia Reynolds <juliacr@google.com> | 2017-08-16 20:58:49 +0000 |
| commit | 00004c44d73f7f46e8f25188403ca17a70edea8f (patch) | |
| tree | 381778e1a8bd28a4b6fba222422e7c129f3cf5e9 /core/java/android | |
| parent | 8d7cd4bcaa126eca061c49a32cb8e7a6ec17e88b (diff) | |
Optionally append managed service approvals
If the backup comes from a pre O device, don't wipe
preexisting managed service grants (which were introduced in O).
Merged-In: I142df7acb11309bc4f5f185e45a1f91f86d0334a
Merged-In: Ie569972dc0d076718a3a9c59e1ebd942c5bfa987
Test: manual, restore from N to O DR
Bug: 64232609
Change-Id: Ieec2c821d9a088c69a5bc143acf8537ba300202d
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/content/Intent.java | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index f70215b46a5e..9008ddc75b09 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -3444,11 +3444,13 @@ public class Intent implements Parcelable, Cloneable { "android.intent.extra.FORCE_FACTORY_RESET"; /** - * Broadcast action: report that a settings element is being restored from backup. The intent - * contains three extras: EXTRA_SETTING_NAME is a string naming the restored setting, - * EXTRA_SETTING_NEW_VALUE is the value being restored, and EXTRA_SETTING_PREVIOUS_VALUE - * is the value of that settings entry prior to the restore operation. All of these values are - * represented as strings. + * Broadcast action: report that a settings element is being restored from backup. The intent + * contains four extras: EXTRA_SETTING_NAME is a string naming the restored setting, + * EXTRA_SETTING_NEW_VALUE is the value being restored, EXTRA_SETTING_PREVIOUS_VALUE + * is the value of that settings entry prior to the restore operation, and + * EXTRA_SETTING_RESTORED_FROM_SDK_INT is the version of the SDK that the setting has been + * restored from (corresponds to {@link android.os.Build.VERSION#SDK_INT}). The first three + * values are represented as strings, the fourth one as int. * * <p>This broadcast is sent only for settings provider entries known to require special handling * around restore time. These entries are found in the BROADCAST_ON_RESTORE table within @@ -3457,6 +3459,7 @@ public class Intent implements Parcelable, Cloneable { * @see #EXTRA_SETTING_NAME * @see #EXTRA_SETTING_PREVIOUS_VALUE * @see #EXTRA_SETTING_NEW_VALUE + * @see #EXTRA_SETTING_RESTORED_FROM_SDK_INT * {@hide} */ public static final String ACTION_SETTING_RESTORED = "android.os.action.SETTING_RESTORED"; @@ -3467,6 +3470,8 @@ public class Intent implements Parcelable, Cloneable { public static final String EXTRA_SETTING_PREVIOUS_VALUE = "previous_value"; /** {@hide} */ public static final String EXTRA_SETTING_NEW_VALUE = "new_value"; + /** {@hide} */ + public static final String EXTRA_SETTING_RESTORED_FROM_SDK_INT = "restored_from_sdk_int"; /** * Activity Action: Process a piece of text. |