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

Merge "Support FBE for managed profiles." into nyc-dev am: 716a9e1892

Browse Source 
am: 86dd0f2a9b

* commit '86dd0f2a9b907f2f8a9cdce2fc7f052916778cd7':
  Support FBE for managed profiles.
This commit is contained in:
Kenny Guy
2016-02-12 15:10:00 +00:00
committed by android-build-merger
parent 4901986dfe 86dd0f2a9b
commit 15f6de3dd2
12 changed files with 160 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3027,6 +3027,17 @@ public class Intent implements Parcelable, Cloneable {
public static final String ACTION_MANAGED_PROFILE_REMOVED =
"android.intent.action.MANAGED_PROFILE_REMOVED";
/**
* Broadcast sent to the primary user when the credential-encrypted private storage for
* an associated managed profile is unlocked. Carries an extra {@link #EXTRA_USER} that
* specifies the UserHandle of the profile that was unlocked. Only applications (for example
* Launchers) that need to display merged content across both primary and managed profiles
* need to worry about this broadcast. This is only sent to registered receivers,
* not manifest receivers.
*/
public static final String ACTION_MANAGED_PROFILE_UNLOCKED =
"android.intent.action.MANAGED_PROFILE_UNLOCKED";
/**
* Broadcast sent to the primary user when an associated managed profile's availability has
* changed. This includes when the user toggles the profile's quiet mode. Carries an extra