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

am 45849beb: Merge "Introduces intents for adding and removing a managed profile."

Browse Source 
* commit '45849beb3bd0d9f4494bdcce919dcf995bcb881b':
  Introduces intents for adding and removing a managed profile.
This commit is contained in:
Alexandra Gherghina
2014-04-07 12:36:25 +00:00
committed by Android Git Automerger
parent b5243150b3 45849beb3b
commit 2ea79b063d
2 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2607,6 +2607,23 @@ public class Intent implements Parcelable, Cloneable {
public static final String ACTION_USER_INFO_CHANGED =
"android.intent.action.USER_INFO_CHANGED";
/**
* Broadcast sent to the primary user when an associated managed profile is added (the profile
* was created and is ready to be used). Carries an extra {@link #EXTRA_USER} that specifies
* the UserHandle of the profile that was added. This is only sent to registered receivers,
* not manifest receivers.
*/
public static final String ACTION_MANAGED_PROFILE_ADDED =
"android.intent.action.MANAGED_PROFILE_ADDED";
/**
* Broadcast sent to the primary user when an associated managed profile is removed. Carries an
* extra {@link #EXTRA_USER} that specifies the UserHandle of the profile that was removed. This
* is only sent to registered receivers, not manifest receivers.
*/
public static final String ACTION_MANAGED_PROFILE_REMOVED =
"android.intent.action.MANAGED_PROFILE_REMOVED";
/**
* Sent when the user taps on the clock widget in the system's "quick settings" area.
*/
@@ -3301,14 +3318,22 @@ public class Intent implements Parcelable, Cloneable {
"android.intent.extra.ALLOW_MULTIPLE";
/**
* The userHandle carried with broadcast intents related to addition, removal and switching of
* users
* - {@link #ACTION_USER_ADDED}, {@link #ACTION_USER_REMOVED} and {@link #ACTION_USER_SWITCHED}.
* The integer userHandle carried with broadcast intents related to addition, removal and
* switching of users and managed profiles - {@link #ACTION_USER_ADDED},
* {@link #ACTION_USER_REMOVED} and {@link #ACTION_USER_SWITCHED}.
*
* @hide
*/
public static final String EXTRA_USER_HANDLE =
"android.intent.extra.user_handle";
/**
* The UserHandle carried with broadcasts intents related to addition and removal of managed
* profiles - {@link #ACTION_MANAGED_PROFILE_ADDED} and {@link #ACTION_MANAGED_PROFILE_REMOVED}.
*/
public static final String EXTRA_USER =
"android.intent.extra.user";
/**
* Extra used in the response from a BroadcastReceiver that handles
* {@link #ACTION_GET_RESTRICTION_ENTRIES}. The type of the extra is