Merge "New device policy API: DeviceAdminReceiver.onUnsafeOperationStateChanged()" into sc-dev (d95e8ac6) · Commits · e / os / android_frameworks_base

core/api/current.txt

+4 −2

core/api/test-current.txt

+2 −2

core/java/android/app/admin/DeviceAdminReceiver.java

+85 −2

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,8 @@

	package android.app.admin;		package android.app.admin;

			import static android.app.admin.DevicePolicyManager.OperationSafetyReason;

	import android.accounts.AccountManager;		import android.accounts.AccountManager;
	import android.annotation.BroadcastBehavior;		import android.annotation.BroadcastBehavior;
	import android.annotation.IntDef;		import android.annotation.IntDef;
	@@ -35,6 +37,7 @@ import android.os.PersistableBundle;
	import android.os.Process;		import android.os.Process;
	import android.os.UserHandle;		import android.os.UserHandle;
	import android.security.KeyChain;		import android.security.KeyChain;
			import android.util.Log;

	import java.lang.annotation.Retention;		import java.lang.annotation.Retention;
	import java.lang.annotation.RetentionPolicy;		import java.lang.annotation.RetentionPolicy;
	@@ -72,8 +75,8 @@ import java.lang.annotation.RetentionPolicy;
	* </div>		* </div>
	*/		*/
	public class DeviceAdminReceiver extends BroadcastReceiver {		public class DeviceAdminReceiver extends BroadcastReceiver {
	private static String TAG = "DevicePolicy";		private static final String TAG = "DevicePolicy";
	private static boolean localLOGV = false;		private static final boolean LOCAL_LOGV = false;

	/**		/**
	* This is the primary action that a device administrator must implement to be		* This is the primary action that a device administrator must implement to be
	@@ -509,6 +512,36 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
	public static final String EXTRA_TRANSFER_OWNERSHIP_ADMIN_EXTRAS_BUNDLE =		public static final String EXTRA_TRANSFER_OWNERSHIP_ADMIN_EXTRAS_BUNDLE =
	"android.app.extra.TRANSFER_OWNERSHIP_ADMIN_EXTRAS_BUNDLE";		"android.app.extra.TRANSFER_OWNERSHIP_ADMIN_EXTRAS_BUNDLE";

			/**
			* Broadcast action: notify the admin that the state of operations that can be unsafe because
			* of a given reason (specified by the {@link #EXTRA_OPERATION_SAFETY_REASON} {@code int} extra)
			* has changed (the new value is specified by the {@link #EXTRA_OPERATION_SAFETY_STATE}
			* {@code boolean} extra).
			*
			* @hide
			*/
			@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
			public static final String ACTION_OPERATION_SAFETY_STATE_CHANGED =
			"android.app.action.OPERATION_SAFETY_STATE_CHANGED";

			/**
			* An {@code int} extra specifying an {@link OperationSafetyReason}.
			*
			* @hide
			*/
			public static final String EXTRA_OPERATION_SAFETY_REASON =
			"android.app.extra.OPERATION_SAFETY_REASON";

			/**
			* An {@code boolean} extra specifying whether an operation will fail due to a
			* {@link OperationSafetyReason}. {@code true} means operations that rely on that reason are
			* safe, while {@code false} means they're unsafe.
			*
			* @hide
			*/
			public static final String EXTRA_OPERATION_SAFETY_STATE =
			"android.app.extra.OPERATION_SAFETY_STATE";

	private DevicePolicyManager mManager;		private DevicePolicyManager mManager;
	private ComponentName mWho;		private ComponentName mWho;

	@@ -1017,6 +1050,51 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
	@NonNull UserHandle user) {		@NonNull UserHandle user) {
	}		}

			/**
			* Called to notify the state of operations that can be unsafe to execute has changed.
			*
			* <p><b>Note:/b> notice that the operation safety state might change between the time this
			* callback is received and the operation's method on {@link DevicePolicyManager} is called, so
			* calls to the latter could still throw a {@link UnsafeStateException} even when this method
			* is called with {@code isSafe} as {@code true}
			*
			* @param context the running context as per {@link #onReceive}
			* @param reason the reason an operation could be unsafe.
			* @param isSafe whether the operation is safe to be executed.
			*/
			public void onOperationSafetyStateChanged(@NonNull Context context,
			@OperationSafetyReason int reason, boolean isSafe) {
			if (LOCAL_LOGV) {
			Log.v(TAG, String.format("onOperationSafetyStateChanged(): %s=%b",
			DevicePolicyManager.operationSafetyReasonToString(reason), isSafe));
			}
			}

			private void onOperationSafetyStateChanged(Context context, Intent intent) {
			if (!hasRequiredExtra(intent, EXTRA_OPERATION_SAFETY_REASON)
			\|\| !hasRequiredExtra(intent, EXTRA_OPERATION_SAFETY_STATE)) {
			return;
			}

			int reason = intent.getIntExtra(EXTRA_OPERATION_SAFETY_REASON,
			DevicePolicyManager.OPERATION_SAFETY_REASON_NONE);
			if (!DevicePolicyManager.isValidOperationSafetyReason(reason)) {
			Log.wtf(TAG, "Received invalid reason on " + intent.getAction() + ": " + reason);
			return;
			}
			boolean isSafe = intent.getBooleanExtra(EXTRA_OPERATION_SAFETY_STATE,
			/* defaultValue=*/ false);

			onOperationSafetyStateChanged(context, reason, isSafe);
			}

			private boolean hasRequiredExtra(Intent intent, String extra) {
			if (intent.hasExtra(extra)) return true;

			Log.wtf(TAG, "Missing '" + extra + "' on intent " + intent);
			return false;
			}

	/**		/**
	* Intercept standard device administrator broadcasts. Implementations		* Intercept standard device administrator broadcasts. Implementations
	* should not override this method; it is better to implement the		* should not override this method; it is better to implement the
	@@ -1025,6 +1103,9 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
	@Override		@Override
	public void onReceive(@NonNull Context context, @NonNull Intent intent) {		public void onReceive(@NonNull Context context, @NonNull Intent intent) {
	String action = intent.getAction();		String action = intent.getAction();
			if (LOCAL_LOGV) {
			Log.v(TAG, "onReceive(): received " + action + " on user " + context.getUserId());
			}

	if (ACTION_PASSWORD_CHANGED.equals(action)) {		if (ACTION_PASSWORD_CHANGED.equals(action)) {
	onPasswordChanged(context, intent, intent.getParcelableExtra(Intent.EXTRA_USER));		onPasswordChanged(context, intent, intent.getParcelableExtra(Intent.EXTRA_USER));
	@@ -1092,6 +1173,8 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
	} else if (ACTION_AFFILIATED_PROFILE_TRANSFER_OWNERSHIP_COMPLETE.equals(action)) {		} else if (ACTION_AFFILIATED_PROFILE_TRANSFER_OWNERSHIP_COMPLETE.equals(action)) {
	onTransferAffiliatedProfileOwnershipComplete(context,		onTransferAffiliatedProfileOwnershipComplete(context,
	intent.getParcelableExtra(Intent.EXTRA_USER));		intent.getParcelableExtra(Intent.EXTRA_USER));
			} else if (ACTION_OPERATION_SAFETY_STATE_CHANGED.equals(action)) {
			onOperationSafetyStateChanged(context, intent);
	}		}
	}		}
	}		}

core/java/android/app/admin/DevicePolicyManager.java

+38 −10

Original line number	Original line	Diff line number	Diff line
	@@ -2922,33 +2922,61 @@ public class DevicePolicyManager {
	return DebugUtils.constantToString(DevicePolicyManager.class, PREFIX_OPERATION, operation);		return DebugUtils.constantToString(DevicePolicyManager.class, PREFIX_OPERATION, operation);
	}		}

	private static final String PREFIX_UNSAFE_OPERATION_REASON = "UNSAFE_OPERATION_REASON_";		private static final String PREFIX_OPERATION_SAFETY_REASON = "OPERATION_SAFETY_REASON_";

	/** @hide */		/** @hide */
	@IntDef(prefix = PREFIX_UNSAFE_OPERATION_REASON, value = {		@IntDef(prefix = PREFIX_OPERATION_SAFETY_REASON, value = {
	UNSAFE_OPERATION_REASON_NONE,		OPERATION_SAFETY_REASON_NONE,
	UNSAFE_OPERATION_REASON_DRIVING_DISTRACTION		OPERATION_SAFETY_REASON_DRIVING_DISTRACTION
	})		})
	@Retention(RetentionPolicy.SOURCE)		@Retention(RetentionPolicy.SOURCE)
	public static @interface UnsafeOperationReason {		public static @interface OperationSafetyReason {
	}		}

	/** @hide */		/** @hide */
	@TestApi		@TestApi
	public static final int UNSAFE_OPERATION_REASON_NONE = -1;		public static final int OPERATION_SAFETY_REASON_NONE = -1;

	/**		/**
	* Indicates that a {@link UnsafeStateException} was thrown because the operation would distract		* Indicates that a {@link UnsafeStateException} was thrown because the operation would distract
	* the driver of the vehicle.		* the driver of the vehicle.
	*/		*/
	public static final int UNSAFE_OPERATION_REASON_DRIVING_DISTRACTION = 1;		public static final int OPERATION_SAFETY_REASON_DRIVING_DISTRACTION = 1;

	/** @hide */		/** @hide */
	@NonNull		@NonNull
	@TestApi		@TestApi
	public static String unsafeOperationReasonToString(@UnsafeOperationReason int reason) {		public static String operationSafetyReasonToString(@OperationSafetyReason int reason) {
	return DebugUtils.constantToString(DevicePolicyManager.class,		return DebugUtils.constantToString(DevicePolicyManager.class,
	PREFIX_UNSAFE_OPERATION_REASON, reason);		PREFIX_OPERATION_SAFETY_REASON, reason);
			}

			/** @hide */
			public static boolean isValidOperationSafetyReason(@OperationSafetyReason int reason) {
			return reason == OPERATION_SAFETY_REASON_DRIVING_DISTRACTION;
			}

			/**
			* Checks if it's safe to run operations that can be affected by the given {@code reason}.
			*
			* <p><b>Note:/b> notice that the operation safety state might change between the time this
			* method returns and the operation's method is called, so calls to the latter could still throw
			* a {@link UnsafeStateException} even when this method returns {@code true}.
			*
			* @param reason currently, only supported reason is
			* {@link #OPERATION_SAFETY_REASON_DRIVING_DISTRACTION}.
			*
			* @return whether it's safe to run operations that can be affected by the given {@code reason}.
			*/
			// TODO(b/173541467): should it throw SecurityException if caller is not admin?
			public boolean isSafeOperation(@OperationSafetyReason int reason) {
			if (mService == null) return false;

			try {
			return mService.isSafeOperation(reason);
			} catch (RemoteException e) {
			throw e.rethrowFromSystemServer();
			}
	}		}

	/** @hide */		/** @hide */
	@@ -13157,7 +13185,7 @@ public class DevicePolicyManager {
	@TestApi		@TestApi
	@RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_ADMINS)		@RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_ADMINS)
	public void setNextOperationSafety(@DevicePolicyOperation int operation,		public void setNextOperationSafety(@DevicePolicyOperation int operation,
	@UnsafeOperationReason int reason) {		@OperationSafetyReason int reason) {
	if (mService != null) {		if (mService != null) {
	try {		try {
	mService.setNextOperationSafety(operation, reason);		mService.setNextOperationSafety(operation, reason);

core/java/android/app/admin/DevicePolicyManagerInternal.java

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,7 @@ package android.app.admin;

	import android.annotation.Nullable;		import android.annotation.Nullable;
	import android.annotation.UserIdInt;		import android.annotation.UserIdInt;
			import android.app.admin.DevicePolicyManager.OperationSafetyReason;
	import android.content.ComponentName;		import android.content.ComponentName;
	import android.content.Intent;		import android.content.Intent;
	import android.os.UserHandle;		import android.os.UserHandle;
	@@ -255,4 +256,14 @@ public abstract class DevicePolicyManagerInternal {
	* {@link #supportsResetOp(int)} is true.		* {@link #supportsResetOp(int)} is true.
	*/		*/
	public abstract void resetOp(int op, String packageName, @UserIdInt int userId);		public abstract void resetOp(int op, String packageName, @UserIdInt int userId);

			/**
			* Notifies the system that an unsafe operation reason has changed.
			*
			* @throws IllegalArgumentException if {@code checker} is not the same as set on
			* {@code DevicePolicyManagerService}.
			*/
			public abstract void notifyUnsafeOperationStateChanged(DevicePolicySafetyChecker checker,
			@OperationSafetyReason int reason, boolean isSafe);

	}		}