diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-08-17 00:31:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-17 00:31:42 +0000 |
| commit | 445a6d42effa9e75ff608cd04f3ddacb31bc5094 (patch) | |
| tree | d8e140085fed368e1c019a975860d71faf923e70 /core/java | |
| parent | 8d272b9dd5cd1831da63872139519d3d84430175 (diff) | |
| parent | 00004c44d73f7f46e8f25188403ca17a70edea8f (diff) | |
Merge "Optionally append managed service approvals" into oc-dr1-dev
Diffstat (limited to 'core/java')
| -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. |