Merge "Added the restrictions pending application restrictions key." into lmp-mr1-dev (3eed90f3) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -22377,6 +22377,7 @@ package android.os {
		field public static final java.lang.String DISALLOW_UNMUTE_MICROPHONE = "no_unmute_microphone";
		field public static final java.lang.String DISALLOW_USB_FILE_TRANSFER = "no_usb_file_transfer";
		field public static final java.lang.String ENSURE_VERIFY_APPS = "ensure_verify_apps";
		field public static final java.lang.String KEY_RESTRICTIONS_PENDING = "restrictions_pending";
		}

		public abstract class Vibrator {

+6 −0

Original line number	Diff line number	Diff line
		@@ -2586,6 +2586,10 @@ public class DevicePolicyManager {
		* <p>The application restrictions are only made visible to the target application and the
		* profile or device owner.
		*
		* <p>If the restrictions are not available yet, but may be applied in the near future,
		* the admin can notify the target application of that by adding
		* {@link UserManager#KEY_RESTRICTIONS_PENDING} to the settings parameter.
		*
		* <p>The calling device admin must be a profile or device owner; if it is not, a security
		* exception will be thrown.
		*
		@@ -2593,6 +2597,8 @@ public class DevicePolicyManager {
		* @param packageName The name of the package to update restricted settings for.
		* @param settings A {@link Bundle} to be parsed by the receiving application, conveying a new
		* set of active restrictions.
		*
		* @see UserManager#KEY_RESTRICTIONS_PENDING
		*/
		public void setApplicationRestrictions(ComponentName admin, String packageName,
		Bundle settings) {

+18 −0

Original line number	Diff line number	Diff line
		@@ -371,6 +371,24 @@ public class UserManager {
		*/
		public static final String DISALLOW_OUTGOING_BEAM = "no_outgoing_beam";

		/**
		* Application restriction key that is used to indicate the pending arrival
		* of real restrictions for the app.
		*
		* <p>
		* Applications that support restrictions should check for the presence of this key.
		* A <code>true</code> value indicates that restrictions may be applied in the near
		* future but are not available yet. It is the responsibility of any
		* management application that sets this flag to update it when the final
		* restrictions are enforced.
		*
		* <p/>Key for application restrictions.
		* <p/>Type: Boolean
		* @see android.app.admin.DevicePolicyManager#addApplicationRestriction()
		* @see android.app.admin.DevicePolicyManager#getApplicationRestriction()
		*/
		public static final String KEY_RESTRICTIONS_PENDING = "restrictions_pending";

		/** @hide */
		public static final int PIN_VERIFICATION_FAILED_INCORRECT = -3;
		/** @hide */