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

Merge "Make ACTION_SETTING_RESTORED SystemApi" am: 2e2a97c04b am: d8ef70a405 am: 2f68d6bc5c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1945287

Change-Id: I447d2f861e1c05f9483fe60e48e45918c448adfd
This commit is contained in:
Treehugger Robot
2022-01-13 02:24:11 +00:00
committed by Automerger Merge Worker
parent bab740d0b4 2f68d6bc5c
commit 082f6e9f08
2 changed files with 46 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/api/module-lib-current.txt
View File

@@ -71,6 +71,14 @@ package android.content {
field public static final String TEST_NETWORK_SERVICE = "test_network";
}
public class Intent implements java.lang.Cloneable android.os.Parcelable {
field public static final String ACTION_SETTING_RESTORED = "android.os.action.SETTING_RESTORED";
field public static final String EXTRA_SETTING_NAME = "setting_name";
field public static final String EXTRA_SETTING_NEW_VALUE = "new_value";
field public static final String EXTRA_SETTING_PREVIOUS_VALUE = "previous_value";
field public static final String EXTRA_SETTING_RESTORED_FROM_SDK_INT = "restored_from_sdk_int";
}
}
package android.content.pm {

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

@@ -4206,9 +4206,9 @@ public class Intent implements Parcelable, Cloneable {
* 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
* the provider's backup agent implementation.
* <p>This broadcast is sent only for settings provider entries known to require special
* handling around restore time to specific receivers. These entries are found in the
* BROADCAST_ON_RESTORE table within the provider's backup agent implementation.
*
* @see #EXTRA_SETTING_NAME
* @see #EXTRA_SETTING_PREVIOUS_VALUE
@@ -4216,15 +4216,46 @@ public class Intent implements Parcelable, Cloneable {
* @see #EXTRA_SETTING_RESTORED_FROM_SDK_INT
* {@hide}
*/
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
@SuppressLint("ActionValue")
public static final String ACTION_SETTING_RESTORED = "android.os.action.SETTING_RESTORED";
/** {@hide} */
/**
* String intent extra to be used with {@link ACTION_SETTING_RESTORED}.
* Contain the name of the restored setting.
* {@hide}
*/
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
@SuppressLint("ActionValue")
public static final String EXTRA_SETTING_NAME = "setting_name";
/** {@hide} */
/**
* String intent extra to be used with {@link ACTION_SETTING_RESTORED}.
* Contain the value of the {@link EXTRA_SETTING_NAME} settings entry prior to the restore
* operation.
* {@hide}
*/
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
@SuppressLint("ActionValue")
public static final String EXTRA_SETTING_PREVIOUS_VALUE = "previous_value";
/** {@hide} */
/**
* String intent extra to be used with {@link ACTION_SETTING_RESTORED}.
* Contain the value of the {@link EXTRA_SETTING_NAME} settings entry being restored.
* {@hide}
*/
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
@SuppressLint("ActionValue")
public static final String EXTRA_SETTING_NEW_VALUE = "new_value";
/** {@hide} */
/**
* Int intent extra to be used with {@link ACTION_SETTING_RESTORED}.
* Contain the version of the SDK that the setting has been restored from (corresponds to
* {@link android.os.Build.VERSION#SDK_INT}).
* {@hide}
*/
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
@SuppressLint("ActionValue")
public static final String EXTRA_SETTING_RESTORED_FROM_SDK_INT = "restored_from_sdk_int";
/**