Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Optionally append managed service approvals" into oc-dr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-17 00:31:42 +00:00
committed by Android (Google) Code Review
parent 8d272b9dd5 00004c44d7
commit 445a6d42ef
4 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/content/Intent.java
View File

@@ -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.