Merge "Flesh out user locked/unlocked lifecycle." (8b4fce4b) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -8286,6 +8286,7 @@ package android.content {
		field public static final java.lang.String ACTION_INSERT_OR_EDIT = "android.intent.action.INSERT_OR_EDIT";
		field public static final java.lang.String ACTION_INSTALL_PACKAGE = "android.intent.action.INSTALL_PACKAGE";
		field public static final java.lang.String ACTION_LOCALE_CHANGED = "android.intent.action.LOCALE_CHANGED";
		field public static final java.lang.String ACTION_LOCKED_BOOT_COMPLETED = "android.intent.action.LOCKED_BOOT_COMPLETED";
		field public static final java.lang.String ACTION_MAIN = "android.intent.action.MAIN";
		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_REMOVED = "android.intent.action.MANAGED_PROFILE_REMOVED";

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -8543,6 +8543,7 @@ package android.content {
		field public static final java.lang.String ACTION_INSTALL_PACKAGE = "android.intent.action.INSTALL_PACKAGE";
		field public static final java.lang.String ACTION_INTENT_FILTER_NEEDS_VERIFICATION = "android.intent.action.INTENT_FILTER_NEEDS_VERIFICATION";
		field public static final java.lang.String ACTION_LOCALE_CHANGED = "android.intent.action.LOCALE_CHANGED";
		field public static final java.lang.String ACTION_LOCKED_BOOT_COMPLETED = "android.intent.action.LOCKED_BOOT_COMPLETED";
		field public static final java.lang.String ACTION_MAIN = "android.intent.action.MAIN";
		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_REMOVED = "android.intent.action.MANAGED_PROFILE_REMOVED";

api/test-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -8286,6 +8286,7 @@ package android.content {
		field public static final java.lang.String ACTION_INSERT_OR_EDIT = "android.intent.action.INSERT_OR_EDIT";
		field public static final java.lang.String ACTION_INSTALL_PACKAGE = "android.intent.action.INSTALL_PACKAGE";
		field public static final java.lang.String ACTION_LOCALE_CHANGED = "android.intent.action.LOCALE_CHANGED";
		field public static final java.lang.String ACTION_LOCKED_BOOT_COMPLETED = "android.intent.action.LOCKED_BOOT_COMPLETED";
		field public static final java.lang.String ACTION_MAIN = "android.intent.action.MAIN";
		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_REMOVED = "android.intent.action.MANAGED_PROFILE_REMOVED";

core/java/android/content/Intent.java

+19 −0

Original line number	Diff line number	Diff line
		@@ -1926,6 +1926,24 @@ public class Intent implements Parcelable, Cloneable {
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_ALARM_CHANGED = "android.intent.action.ALARM_CHANGED";

		/**
		* Broadcast Action: This is broadcast once, after the system has finished
		* booting and the user is in a "locked" state. A user is locked when their
		* credential-encrypted private app data storage is unavailable. Once the
		* user has entered their credentials (such as a lock pattern or PIN) for
		* the first time, the {@link #ACTION_BOOT_COMPLETED} broadcast will be
		* sent.
		* <p>
		* You must hold the
		* {@link android.Manifest.permission#RECEIVE_BOOT_COMPLETED} permission in
		* order to receive this broadcast.
		* <p class="note">
		* This is a protected intent that can only be sent by the system.
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_LOCKED_BOOT_COMPLETED = "android.intent.action.LOCKED_BOOT_COMPLETED";

		/**
		* Broadcast Action: This is broadcast once, after the system has finished
		* booting. It can be used to perform application-specific initialization,
		@@ -1938,6 +1956,7 @@ public class Intent implements Parcelable, Cloneable {
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_BOOT_COMPLETED = "android.intent.action.BOOT_COMPLETED";

		/**
		* Broadcast Action: This is broadcast when a user action should request a
		* temporary system dialog to dismiss. Some examples of temporary system

services/core/java/com/android/server/SystemService.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -132,6 +132,15 @@ public abstract class SystemService {
		*/
		public void onStartUser(int userHandle) {}

		/**
		* Called when an existing user is unlocked. This means the
		* credential-encrypted storage for that user is now available, and
		* encryption-aware component filtering is no longer in effect.
		*
		* @param userHandle The identifier of the user.
		*/
		public void onUnlockUser(int userHandle) {}

		/**
		* Called when switching to a different foreground user, for system services that have
		* special behavior for whichever user is currently in the foreground. This is called