Merge "Introduce quiet mode state to managed profile users" (cc586c5a) · Commits · e / os / android_frameworks_base

api/current.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -8258,6 +8258,7 @@ package android.content {
		field public static final java.lang.String ACTION_APP_ERROR = "android.intent.action.APP_ERROR";
		field public static final java.lang.String ACTION_ASSIST = "android.intent.action.ASSIST";
		field public static final java.lang.String ACTION_ATTACH_DATA = "android.intent.action.ATTACH_DATA";
		field public static final java.lang.String ACTION_AVAILABILITY_CHANGED = "android.intent.action.AVAILABILITY_CHANGED";
		field public static final java.lang.String ACTION_BATTERY_CHANGED = "android.intent.action.BATTERY_CHANGED";
		field public static final java.lang.String ACTION_BATTERY_LOW = "android.intent.action.BATTERY_LOW";
		field public static final java.lang.String ACTION_BATTERY_OKAY = "android.intent.action.BATTERY_OKAY";
		@@ -8297,6 +8298,7 @@ package android.content {
		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_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_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";
		@@ -8441,6 +8443,7 @@ package android.content {
		field public static final java.lang.String EXTRA_PHONE_NUMBER = "android.intent.extra.PHONE_NUMBER";
		field public static final java.lang.String EXTRA_PROCESS_TEXT = "android.intent.extra.PROCESS_TEXT";
		field public static final java.lang.String EXTRA_PROCESS_TEXT_READONLY = "android.intent.extra.PROCESS_TEXT_READONLY";
		field public static final java.lang.String EXTRA_QUIET_MODE = "android.intent.extra.QUIET_MODE";
		field public static final java.lang.String EXTRA_REFERRER = "android.intent.extra.REFERRER";
		field public static final java.lang.String EXTRA_REFERRER_NAME = "android.intent.extra.REFERRER_NAME";
		field public static final java.lang.String EXTRA_REMOTE_INTENT_TOKEN = "android.intent.extra.remote_intent_token";
		@@ -28073,6 +28076,7 @@ package android.os {
		method public android.os.Bundle getUserRestrictions();
		method public android.os.Bundle getUserRestrictions(android.os.UserHandle);
		method public boolean hasUserRestriction(java.lang.String);
		method public boolean isQuietModeEnabled(android.os.UserHandle);
		method public boolean isSystemUser();
		method public boolean isUserAGoat();
		method public boolean isUserRunning(android.os.UserHandle);
		@@ -64103,3 +64107,4 @@ package org.xmlpull.v1.sax2 {
		}

		}

api/system-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -8514,6 +8514,7 @@ package android.content {
		field public static final java.lang.String ACTION_APP_ERROR = "android.intent.action.APP_ERROR";
		field public static final java.lang.String ACTION_ASSIST = "android.intent.action.ASSIST";
		field public static final java.lang.String ACTION_ATTACH_DATA = "android.intent.action.ATTACH_DATA";
		field public static final java.lang.String ACTION_AVAILABILITY_CHANGED = "android.intent.action.AVAILABILITY_CHANGED";
		field public static final java.lang.String ACTION_BATTERY_CHANGED = "android.intent.action.BATTERY_CHANGED";
		field public static final java.lang.String ACTION_BATTERY_LOW = "android.intent.action.BATTERY_LOW";
		field public static final java.lang.String ACTION_BATTERY_OKAY = "android.intent.action.BATTERY_OKAY";
		@@ -8555,6 +8556,7 @@ package android.content {
		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_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_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";
		@@ -8705,6 +8707,7 @@ package android.content {
		field public static final java.lang.String EXTRA_PHONE_NUMBER = "android.intent.extra.PHONE_NUMBER";
		field public static final java.lang.String EXTRA_PROCESS_TEXT = "android.intent.extra.PROCESS_TEXT";
		field public static final java.lang.String EXTRA_PROCESS_TEXT_READONLY = "android.intent.extra.PROCESS_TEXT_READONLY";
		field public static final java.lang.String EXTRA_QUIET_MODE = "android.intent.extra.QUIET_MODE";
		field public static final java.lang.String EXTRA_REFERRER = "android.intent.extra.REFERRER";
		field public static final java.lang.String EXTRA_REFERRER_NAME = "android.intent.extra.REFERRER_NAME";
		field public static final java.lang.String EXTRA_REMOTE_INTENT_TOKEN = "android.intent.extra.remote_intent_token";
		@@ -30066,6 +30069,7 @@ package android.os {
		method public android.os.Bundle getUserRestrictions(android.os.UserHandle);
		method public boolean hasUserRestriction(java.lang.String);
		method public boolean isManagedProfile();
		method public boolean isQuietModeEnabled(android.os.UserHandle);
		method public boolean isSystemUser();
		method public boolean isUserAGoat();
		method public boolean isUserRunning(android.os.UserHandle);

api/test-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -8258,6 +8258,7 @@ package android.content {
		field public static final java.lang.String ACTION_APP_ERROR = "android.intent.action.APP_ERROR";
		field public static final java.lang.String ACTION_ASSIST = "android.intent.action.ASSIST";
		field public static final java.lang.String ACTION_ATTACH_DATA = "android.intent.action.ATTACH_DATA";
		field public static final java.lang.String ACTION_AVAILABILITY_CHANGED = "android.intent.action.AVAILABILITY_CHANGED";
		field public static final java.lang.String ACTION_BATTERY_CHANGED = "android.intent.action.BATTERY_CHANGED";
		field public static final java.lang.String ACTION_BATTERY_LOW = "android.intent.action.BATTERY_LOW";
		field public static final java.lang.String ACTION_BATTERY_OKAY = "android.intent.action.BATTERY_OKAY";
		@@ -8297,6 +8298,7 @@ package android.content {
		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_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_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";
		@@ -8441,6 +8443,7 @@ package android.content {
		field public static final java.lang.String EXTRA_PHONE_NUMBER = "android.intent.extra.PHONE_NUMBER";
		field public static final java.lang.String EXTRA_PROCESS_TEXT = "android.intent.extra.PROCESS_TEXT";
		field public static final java.lang.String EXTRA_PROCESS_TEXT_READONLY = "android.intent.extra.PROCESS_TEXT_READONLY";
		field public static final java.lang.String EXTRA_QUIET_MODE = "android.intent.extra.QUIET_MODE";
		field public static final java.lang.String EXTRA_REFERRER = "android.intent.extra.REFERRER";
		field public static final java.lang.String EXTRA_REFERRER_NAME = "android.intent.extra.REFERRER_NAME";
		field public static final java.lang.String EXTRA_REMOTE_INTENT_TOKEN = "android.intent.extra.remote_intent_token";
		@@ -28073,6 +28076,7 @@ package android.os {
		method public android.os.Bundle getUserRestrictions();
		method public android.os.Bundle getUserRestrictions(android.os.UserHandle);
		method public boolean hasUserRestriction(java.lang.String);
		method public boolean isQuietModeEnabled(android.os.UserHandle);
		method public boolean isSystemUser();
		method public boolean isUserAGoat();
		method public boolean isUserRunning(android.os.UserHandle);

core/java/android/content/Intent.java

+26 −0

Original line number	Diff line number	Diff line
		@@ -2990,6 +2990,28 @@ 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 an associated managed profile's availability has
		* changed. This includes when the user toggles the profile's quiet mode, or when the profile
		* owner suspends the profile. Carries an extra {@link #EXTRA_USER} that specifies the
		* UserHandle of the profile. When quiet mode is changed, this broadcast will carry a boolean
		* extra {@link #EXTRA_QUIET_MODE} indicating the new state of quiet mode. This is only sent to
		* registered receivers, not manifest receivers.
		*/
		public static final String ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED =
		"android.intent.action.MANAGED_PROFILE_AVAILABILITY_CHANGED";

		/**
		* Broadcast sent to the managed profile when its availability has changed. This includes when
		* the user toggles the profile's quiet mode, or when the profile owner suspends the profile.
		* When quiet mode is changed, this broadcast will carry a boolean extra
		* {@link #EXTRA_QUIET_MODE} indicating the new state of quiet mode. This is only sent to
		* registered receivers, not manifest receivers. See also
		* {@link #ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED}
		*/
		public static final String ACTION_AVAILABILITY_CHANGED =
		"android.intent.action.AVAILABILITY_CHANGED";

		/**
		* Sent when the user taps on the clock widget in the system's "quick settings" area.
		*/
		@@ -4028,6 +4050,10 @@ public class Intent implements Parcelable, Cloneable {
		/** {@hide} */
		public static final String EXTRA_INDEX = "android.intent.extra.INDEX";

		/**
		* Optional boolean extra indicating whether quiet mode has been switched on or off.
		*/
		public static final String EXTRA_QUIET_MODE = "android.intent.extra.QUIET_MODE";
		// ---------------------------------------------------------------------
		// ---------------------------------------------------------------------
		// Intent flags (see mFlags variable).

core/java/android/content/pm/UserInfo.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -76,6 +76,7 @@ public class UserInfo implements Parcelable {
		*/
		public static final int FLAG_DISABLED = 0x00000040;

		public static final int FLAG_QUIET_MODE = 0x00000080;

		public static final int NO_PROFILE_GROUP_ID = UserHandle.USER_NULL;

		@@ -130,6 +131,9 @@ public class UserInfo implements Parcelable {
		return (flags & FLAG_DISABLED) != FLAG_DISABLED;
		}

		public boolean isQuietModeEnabled() {
		return (flags & FLAG_QUIET_MODE) == FLAG_QUIET_MODE;
		}
		/**
		* Returns true if the user is a split system user.
		* <p>If {@link UserManager#isSplitSystemUser split system user mode} is not enabled,