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

Make master clear constants system APIs.

Browse Source 
This is needed for unbundling of the OobConfig apk.

Test: gts-tradefed run gts -m GtsGmscoreHostTestCases --test com.google.android.gts.devicepolicy.DeviceOwnerUserRestrictionTest#testFactoryReset_disallowFactoryReset

Bug: 32974361

Change-Id: I71e7270bb4c3234ec0516382b18a2ca35aab4c81
This commit is contained in:
Lenka Trochtova
2016-11-18 17:34:34 +01:00
parent 860239ed4a
commit 73aeea2da2
5 changed files with 56 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3226,17 +3226,53 @@ public class Intent implements Parcelable, Cloneable {
public static final String
ACTION_DYNAMIC_SENSOR_CHANGED = "android.intent.action.DYNAMIC_SENSOR_CHANGED";
/** {@hide} */
/**
* Deprecated - use {@link #ACTION_FACTORY_RESET} instead.
*
* {@hide}
*/
@Deprecated
public static final String ACTION_MASTER_CLEAR = "android.intent.action.MASTER_CLEAR";
/**
* Boolean intent extra to be used with {@link ACTION_MASTER_CLEAR} in order to force a factory
* reset even if {@link android.os.UserManager.DISALLOW_FACTORY_RESET} is set.
* Boolean intent extra to be used with {@link #ACTION_MASTER_CLEAR} in order to force a factory
* reset even if {@link android.os.UserManager#DISALLOW_FACTORY_RESET} is set.
*
* <p>Deprecated - use {@link #EXTRA_FORCE_FACTORY_RESET} instead.
*
* @hide
*/
@Deprecated
public static final String EXTRA_FORCE_MASTER_CLEAR =
"android.intent.extra.FORCE_MASTER_CLEAR";
/**
* A broadcast action to trigger a factory reset.
*
* <p> The sender must hold the {@link android.Manifest.permission#MASTER_CLEAR} permission.
*
* <p>Not for use by third-party applications.
*
* @see #EXTRA_FORCE_MASTER_CLEAR
*
* {@hide}
*/
@SystemApi
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_FACTORY_RESET = "android.intent.action.FACTORY_RESET";
/**
* Boolean intent extra to be used with {@link #ACTION_MASTER_CLEAR} in order to force a factory
* reset even if {@link android.os.UserManager#DISALLOW_FACTORY_RESET} is set.
*
* <p>Not for use by third-party applications.
*
* @hide
*/
@SystemApi
public static final String EXTRA_FORCE_FACTORY_RESET =
"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,