Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1b30266 authored Feb 09, 2016 by Kenny Guy

Support FBE for managed profiles.

Allow launcher to see and attempt to launch non-crypto
aware application when profile is locked.
Hide unlock notification until parent user is unlocked.
Have unlock notitication use confirm credentials to unlock
the profile.
Updated notification strings as per suggestions in mocks
to make it clearer between users and profiles.

Bug: 27038260

Change-Id: If2d2c8148670d814544f4edd44193d15da32a289

parent 29b13190

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -8512,6 +8512,7 @@ package android.content {
		field public static final java.lang.String ACTION_MANAGED_PROFILE_ADDED = "android.intent.action.MANAGED_PROFILE_ADDED";
		field public static final java.lang.String ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED = "android.intent.action.MANAGED_PROFILE_AVAILABILITY_CHANGED";
		field public static final java.lang.String ACTION_MANAGED_PROFILE_REMOVED = "android.intent.action.MANAGED_PROFILE_REMOVED";
		field public static final java.lang.String ACTION_MANAGED_PROFILE_UNLOCKED = "android.intent.action.MANAGED_PROFILE_UNLOCKED";
		field public static final java.lang.String ACTION_MANAGE_NETWORK_USAGE = "android.intent.action.MANAGE_NETWORK_USAGE";
		field public static final java.lang.String ACTION_MANAGE_PACKAGE_STORAGE = "android.intent.action.MANAGE_PACKAGE_STORAGE";
		field public static final java.lang.String ACTION_MEDIA_BAD_REMOVAL = "android.intent.action.MEDIA_BAD_REMOVAL";

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -8818,6 +8818,7 @@ package android.content {
		field public static final java.lang.String ACTION_MANAGED_PROFILE_ADDED = "android.intent.action.MANAGED_PROFILE_ADDED";
		field public static final java.lang.String ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED = "android.intent.action.MANAGED_PROFILE_AVAILABILITY_CHANGED";
		field public static final java.lang.String ACTION_MANAGED_PROFILE_REMOVED = "android.intent.action.MANAGED_PROFILE_REMOVED";
		field public static final java.lang.String ACTION_MANAGED_PROFILE_UNLOCKED = "android.intent.action.MANAGED_PROFILE_UNLOCKED";
		field public static final java.lang.String ACTION_MANAGE_NETWORK_USAGE = "android.intent.action.MANAGE_NETWORK_USAGE";
		field public static final java.lang.String ACTION_MANAGE_PACKAGE_STORAGE = "android.intent.action.MANAGE_PACKAGE_STORAGE";
		field public static final java.lang.String ACTION_MEDIA_BAD_REMOVAL = "android.intent.action.MEDIA_BAD_REMOVAL";

api/test-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -8517,6 +8517,7 @@ package android.content {
		field public static final java.lang.String ACTION_MANAGED_PROFILE_ADDED = "android.intent.action.MANAGED_PROFILE_ADDED";
		field public static final java.lang.String ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED = "android.intent.action.MANAGED_PROFILE_AVAILABILITY_CHANGED";
		field public static final java.lang.String ACTION_MANAGED_PROFILE_REMOVED = "android.intent.action.MANAGED_PROFILE_REMOVED";
		field public static final java.lang.String ACTION_MANAGED_PROFILE_UNLOCKED = "android.intent.action.MANAGED_PROFILE_UNLOCKED";
		field public static final java.lang.String ACTION_MANAGE_NETWORK_USAGE = "android.intent.action.MANAGE_NETWORK_USAGE";
		field public static final java.lang.String ACTION_MANAGE_PACKAGE_STORAGE = "android.intent.action.MANAGE_PACKAGE_STORAGE";
		field public static final java.lang.String ACTION_MEDIA_BAD_REMOVAL = "android.intent.action.MEDIA_BAD_REMOVAL";

core/java/android/content/Intent.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -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

core/res/res/values/strings.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -4210,6 +4210,11 @@
		<!-- Notification detail shown when user profile is credential encrypted and requires the user to unlock before some features are usable [CHAR LIMIT=30] -->
		<string name="user_encrypted_detail">User data locked</string>

		<!-- Notification detail shown when work profile is credential encrypted and requires the user to unlock before some features are usable [CHAR LIMIT=30] -->
		<string name="profile_encrypted_detail">Work profile locked</string>
		<!-- Notification message shown when work profile is credential encrypted and requires the user to unlock before some features are usable [CHAR LIMIT=30] -->
		<string name="profile_encrypted_message">Tap to unlock work profile</string>

		<!-- Title of notification shown after a MTP device is connected to Android. -->
		<string name="usb_mtp_launch_notification_title">Connected to <xliff:g id="product_name">%1$s</xliff:g></string>
		<!-- Description of notification shown after a MTP device is connected to Android. -->