Merge "Tweak DelegatedAdminReceiver API surfaces" (9c3f325c) · Commits · e / os / android_frameworks_base

api/current.txt

+34 −34

Original line number	Diff line number	Diff line
		@@ -6509,9 +6509,9 @@ package android.app.admin {

		public class DelegatedAdminReceiver extends android.content.BroadcastReceiver {
		ctor public DelegatedAdminReceiver();
		method public String onChoosePrivateKeyAlias(android.content.Context, android.content.Intent, int, android.net.Uri, String);
		method public void onNetworkLogsAvailable(android.content.Context, android.content.Intent, long, int);
		method public void onReceive(android.content.Context, android.content.Intent);
		method @Nullable public String onChoosePrivateKeyAlias(@NonNull android.content.Context, @NonNull android.content.Intent, int, @Nullable android.net.Uri, @Nullable String);
		method public void onNetworkLogsAvailable(@NonNull android.content.Context, @NonNull android.content.Intent, long, @IntRange(from=1) int);
		method public final void onReceive(@NonNull android.content.Context, @NonNull android.content.Intent);
		}

		public final class DeviceAdminInfo implements android.os.Parcelable {
		@@ -6544,38 +6544,38 @@ package android.app.admin {

		public class DeviceAdminReceiver extends android.content.BroadcastReceiver {
		ctor public DeviceAdminReceiver();
		method public android.app.admin.DevicePolicyManager getManager(android.content.Context);
		method public android.content.ComponentName getWho(android.content.Context);
		method public void onBugreportFailed(android.content.Context, android.content.Intent, int);
		method public void onBugreportShared(android.content.Context, android.content.Intent, String);
		method public void onBugreportSharingDeclined(android.content.Context, android.content.Intent);
		method public String onChoosePrivateKeyAlias(android.content.Context, android.content.Intent, int, android.net.Uri, String);
		method public CharSequence onDisableRequested(android.content.Context, android.content.Intent);
		method public void onDisabled(android.content.Context, android.content.Intent);
		method public void onEnabled(android.content.Context, android.content.Intent);
		method public void onLockTaskModeEntering(android.content.Context, android.content.Intent, String);
		method public void onLockTaskModeExiting(android.content.Context, android.content.Intent);
		method public void onNetworkLogsAvailable(android.content.Context, android.content.Intent, long, int);
		method @Deprecated public void onPasswordChanged(android.content.Context, android.content.Intent);
		method public void onPasswordChanged(android.content.Context, android.content.Intent, android.os.UserHandle);
		method @Deprecated public void onPasswordExpiring(android.content.Context, android.content.Intent);
		method public void onPasswordExpiring(android.content.Context, android.content.Intent, android.os.UserHandle);
		method @Deprecated public void onPasswordFailed(android.content.Context, android.content.Intent);
		method public void onPasswordFailed(android.content.Context, android.content.Intent, android.os.UserHandle);
		method @Deprecated public void onPasswordSucceeded(android.content.Context, android.content.Intent);
		method public void onPasswordSucceeded(android.content.Context, android.content.Intent, android.os.UserHandle);
		method public void onProfileProvisioningComplete(android.content.Context, android.content.Intent);
		method @Deprecated public void onReadyForUserInitialization(android.content.Context, android.content.Intent);
		method public void onReceive(android.content.Context, android.content.Intent);
		method public void onSecurityLogsAvailable(android.content.Context, android.content.Intent);
		method public void onSystemUpdatePending(android.content.Context, android.content.Intent, long);
		method public void onTransferAffiliatedProfileOwnershipComplete(android.content.Context, android.os.UserHandle);
		method @NonNull public android.app.admin.DevicePolicyManager getManager(@NonNull android.content.Context);
		method @NonNull public android.content.ComponentName getWho(@NonNull android.content.Context);
		method public void onBugreportFailed(@NonNull android.content.Context, @NonNull android.content.Intent, int);
		method public void onBugreportShared(@NonNull android.content.Context, @NonNull android.content.Intent, @NonNull String);
		method public void onBugreportSharingDeclined(@NonNull android.content.Context, @NonNull android.content.Intent);
		method @Nullable public String onChoosePrivateKeyAlias(@NonNull android.content.Context, @NonNull android.content.Intent, int, @Nullable android.net.Uri, @Nullable String);
		method @Nullable public CharSequence onDisableRequested(@NonNull android.content.Context, @NonNull android.content.Intent);
		method public void onDisabled(@NonNull android.content.Context, @NonNull android.content.Intent);
		method public void onEnabled(@NonNull android.content.Context, @NonNull android.content.Intent);
		method public void onLockTaskModeEntering(@NonNull android.content.Context, @NonNull android.content.Intent, @NonNull String);
		method public void onLockTaskModeExiting(@NonNull android.content.Context, @NonNull android.content.Intent);
		method public void onNetworkLogsAvailable(@NonNull android.content.Context, @NonNull android.content.Intent, long, @IntRange(from=1) int);
		method @Deprecated public void onPasswordChanged(@NonNull android.content.Context, @NonNull android.content.Intent);
		method public void onPasswordChanged(@NonNull android.content.Context, @NonNull android.content.Intent, @NonNull android.os.UserHandle);
		method @Deprecated public void onPasswordExpiring(@NonNull android.content.Context, @NonNull android.content.Intent);
		method public void onPasswordExpiring(@NonNull android.content.Context, @NonNull android.content.Intent, @NonNull android.os.UserHandle);
		method @Deprecated public void onPasswordFailed(@NonNull android.content.Context, @NonNull android.content.Intent);
		method public void onPasswordFailed(@NonNull android.content.Context, @NonNull android.content.Intent, @NonNull android.os.UserHandle);
		method @Deprecated public void onPasswordSucceeded(@NonNull android.content.Context, @NonNull android.content.Intent);
		method public void onPasswordSucceeded(@NonNull android.content.Context, @NonNull android.content.Intent, @NonNull android.os.UserHandle);
		method public void onProfileProvisioningComplete(@NonNull android.content.Context, @NonNull android.content.Intent);
		method @Deprecated public void onReadyForUserInitialization(@NonNull android.content.Context, @NonNull android.content.Intent);
		method public void onReceive(@NonNull android.content.Context, @NonNull android.content.Intent);
		method public void onSecurityLogsAvailable(@NonNull android.content.Context, @NonNull android.content.Intent);
		method public void onSystemUpdatePending(@NonNull android.content.Context, @NonNull android.content.Intent, long);
		method public void onTransferAffiliatedProfileOwnershipComplete(@NonNull android.content.Context, @NonNull android.os.UserHandle);
		method public void onTransferOwnershipComplete(@NonNull android.content.Context, @Nullable android.os.PersistableBundle);
		method public void onUserAdded(android.content.Context, android.content.Intent, @NonNull android.os.UserHandle);
		method public void onUserRemoved(android.content.Context, android.content.Intent, @NonNull android.os.UserHandle);
		method public void onUserStarted(android.content.Context, android.content.Intent, @NonNull android.os.UserHandle);
		method public void onUserStopped(android.content.Context, android.content.Intent, @NonNull android.os.UserHandle);
		method public void onUserSwitched(android.content.Context, android.content.Intent, @NonNull android.os.UserHandle);
		method public void onUserAdded(@NonNull android.content.Context, @NonNull android.content.Intent, @NonNull android.os.UserHandle);
		method public void onUserRemoved(@NonNull android.content.Context, @NonNull android.content.Intent, @NonNull android.os.UserHandle);
		method public void onUserStarted(@NonNull android.content.Context, @NonNull android.content.Intent, @NonNull android.os.UserHandle);
		method public void onUserStopped(@NonNull android.content.Context, @NonNull android.content.Intent, @NonNull android.os.UserHandle);
		method public void onUserSwitched(@NonNull android.content.Context, @NonNull android.content.Intent, @NonNull android.os.UserHandle);
		field public static final String ACTION_CHOOSE_PRIVATE_KEY_ALIAS = "android.app.action.CHOOSE_PRIVATE_KEY_ALIAS";
		field public static final String ACTION_DEVICE_ADMIN_DISABLED = "android.app.action.DEVICE_ADMIN_DISABLED";
		field public static final String ACTION_DEVICE_ADMIN_DISABLE_REQUESTED = "android.app.action.DEVICE_ADMIN_DISABLE_REQUESTED";

core/java/android/app/admin/DelegatedAdminReceiver.java

+17 −11

Original line number	Diff line number	Diff line
		@@ -24,6 +24,9 @@ import static android.app.admin.DeviceAdminReceiver.EXTRA_CHOOSE_PRIVATE_KEY_URI
		import static android.app.admin.DeviceAdminReceiver.EXTRA_NETWORK_LOGS_COUNT;
		import static android.app.admin.DeviceAdminReceiver.EXTRA_NETWORK_LOGS_TOKEN;

		import android.annotation.IntRange;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.app.Service;
		import android.content.BroadcastReceiver;
		import android.content.Context;
		@@ -63,20 +66,21 @@ public class DelegatedAdminReceiver extends BroadcastReceiver {
		*
		* <p> This callback is only applicable if the delegated app has
		* {@link DevicePolicyManager#DELEGATION_CERT_SELECTION} capability. Additionally, it must
		* declare an intent fitler for {@link DeviceAdminReceiver#ACTION_CHOOSE_PRIVATE_KEY_ALIAS}
		* in the receiver's manifest in order to receive this callback.
		* declare an intent filter for {@link DeviceAdminReceiver#ACTION_CHOOSE_PRIVATE_KEY_ALIAS}
		* in the receiver's manifest in order to receive this callback. The default implementation
		* simply throws {@link UnsupportedOperationException}.
		*
		* @param context The running context as per {@link #onReceive}.
		* @param intent The received intent as per {@link #onReceive}.
		* @param uid The uid asking for the private key and certificate pair.
		* @param uid The uid of the app asking for the private key and certificate pair.
		* @param uri The URI to authenticate, may be null.
		* @param alias The alias preselected by the client, or null.
		* @return The private key alias to return and grant access to.
		* @see KeyChain#choosePrivateKeyAlias
		*/
		public String onChoosePrivateKeyAlias(Context context, Intent intent, int uid, Uri uri,
		String alias) {
		return null;
		public @Nullable String onChoosePrivateKeyAlias(@NonNull Context context,
		@NonNull Intent intent, int uid, @Nullable Uri uri, @Nullable String alias) {
		throw new UnsupportedOperationException("onChoosePrivateKeyAlias should be implemented");
		}

		/**
		@@ -91,8 +95,9 @@ public class DelegatedAdminReceiver extends BroadcastReceiver {
		*
		* <p> This callback is only applicable if the delegated app has
		* {@link DevicePolicyManager#DELEGATION_NETWORK_LOGGING} capability. Additionally, it must
		* declare an intent fitler for {@link DeviceAdminReceiver#ACTION_NETWORK_LOGS_AVAILABLE} in the
		* receiver's manifest in order to receive this callback.
		* declare an intent filter for {@link DeviceAdminReceiver#ACTION_NETWORK_LOGS_AVAILABLE} in the
		* receiver's manifest in order to receive this callback. The default implementation
		* simply throws {@link UnsupportedOperationException}.
		*
		* @param context The running context as per {@link #onReceive}.
		* @param intent The received intent as per {@link #onReceive}.
		@@ -100,8 +105,9 @@ public class DelegatedAdminReceiver extends BroadcastReceiver {
		* @param networkLogsCount The total count of events in the current batch of network logs.
		* @see DevicePolicyManager#retrieveNetworkLogs
		*/
		public void onNetworkLogsAvailable(Context context, Intent intent, long batchToken,
		int networkLogsCount) {
		public void onNetworkLogsAvailable(@NonNull Context context, @NonNull Intent intent,
		long batchToken, @IntRange(from = 1) int networkLogsCount) {
		throw new UnsupportedOperationException("onNetworkLogsAvailable should be implemented");
		}

		/**
		@@ -109,7 +115,7 @@ public class DelegatedAdminReceiver extends BroadcastReceiver {
		* this method; implement the convenience callbacks for each action instead.
		*/
		@Override
		public void onReceive(Context context, Intent intent) {
		public final void onReceive(@NonNull Context context, @NonNull Intent intent) {
		String action = intent.getAction();

		if (ACTION_CHOOSE_PRIVATE_KEY_ALIAS.equals(action)) {

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

+50 −35

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package android.app.admin;
		import android.accounts.AccountManager;
		import android.annotation.BroadcastBehavior;
		import android.annotation.IntDef;
		import android.annotation.IntRange;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SdkConstant;
		@@ -515,7 +516,7 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* Retrieve the DevicePolicyManager interface for this administrator to work
		* with the system.
		*/
		public DevicePolicyManager getManager(Context context) {
		public @NonNull DevicePolicyManager getManager(@NonNull Context context) {
		if (mManager != null) {
		return mManager;
		}
		@@ -529,7 +530,7 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* use in {@link DevicePolicyManager} APIs that require the administrator to
		* identify itself.
		*/
		public ComponentName getWho(Context context) {
		public @NonNull ComponentName getWho(@NonNull Context context) {
		if (mWho != null) {
		return mWho;
		}
		@@ -550,7 +551,7 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* @param context The running context as per {@link #onReceive}.
		* @param intent The received intent as per {@link #onReceive}.
		*/
		public void onEnabled(Context context, Intent intent) {
		public void onEnabled(@NonNull Context context, @NonNull Intent intent) {
		}

		/**
		@@ -564,7 +565,8 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* @return Return the warning message to display to the user before
		* being disabled; if null is returned, no message is displayed.
		*/
		public CharSequence onDisableRequested(Context context, Intent intent) {
		public @Nullable CharSequence onDisableRequested(@NonNull Context context,
		@NonNull Intent intent) {
		return null;
		}

		@@ -576,7 +578,7 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* @param context The running context as per {@link #onReceive}.
		* @param intent The received intent as per {@link #onReceive}.
		*/
		public void onDisabled(Context context, Intent intent) {
		public void onDisabled(@NonNull Context context, @NonNull Intent intent) {
		}

		/**
		@@ -591,7 +593,7 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* {@link #onPasswordChanged(Context, Intent, UserHandle)} instead.
		*/
		@Deprecated
		public void onPasswordChanged(Context context, Intent intent) {
		public void onPasswordChanged(@NonNull Context context, @NonNull Intent intent) {
		}

		/**
		@@ -605,7 +607,8 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* user is the current profile or a parent user, check for equality with
		* {@link Process#myUserHandle}.
		*/
		public void onPasswordChanged(Context context, Intent intent, UserHandle user) {
		public void onPasswordChanged(@NonNull Context context, @NonNull Intent intent,
		@NonNull UserHandle user) {
		onPasswordChanged(context, intent);
		}

		@@ -621,7 +624,7 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* {@link #onPasswordFailed(Context, Intent, UserHandle)} instead.
		*/
		@Deprecated
		public void onPasswordFailed(Context context, Intent intent) {
		public void onPasswordFailed(@NonNull Context context, @NonNull Intent intent) {
		}

		/**
		@@ -635,7 +638,8 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* user is the current profile or a parent user, check for equality with
		* {@link Process#myUserHandle}.
		*/
		public void onPasswordFailed(Context context, Intent intent, UserHandle user) {
		public void onPasswordFailed(@NonNull Context context, @NonNull Intent intent,
		@NonNull UserHandle user) {
		onPasswordFailed(context, intent);
		}

		@@ -651,7 +655,7 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* {@link #onPasswordSucceeded(Context, Intent, UserHandle)} instead.
		*/
		@Deprecated
		public void onPasswordSucceeded(Context context, Intent intent) {
		public void onPasswordSucceeded(@NonNull Context context, @NonNull Intent intent) {
		}

		/**
		@@ -665,7 +669,8 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* user is the current profile or a parent user, check for equality with
		* {@link Process#myUserHandle}.
		*/
		public void onPasswordSucceeded(Context context, Intent intent, UserHandle user) {
		public void onPasswordSucceeded(@NonNull Context context, @NonNull Intent intent,
		@NonNull UserHandle user) {
		onPasswordSucceeded(context, intent);
		}

		@@ -691,7 +696,7 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* {@link #onPasswordExpiring(Context, Intent, UserHandle)} instead.
		*/
		@Deprecated
		public void onPasswordExpiring(Context context, Intent intent) {
		public void onPasswordExpiring(@NonNull Context context, @NonNull Intent intent) {
		}

		/**
		@@ -715,7 +720,8 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* user is the current profile or a parent user, check for equality with
		* {@link Process#myUserHandle}.
		*/
		public void onPasswordExpiring(Context context, Intent intent, UserHandle user) {
		public void onPasswordExpiring(@NonNull Context context, @NonNull Intent intent,
		@NonNull UserHandle user) {
		onPasswordExpiring(context, intent);
		}

		@@ -746,7 +752,7 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* @param context The running context as per {@link #onReceive}.
		* @param intent The received intent as per {@link #onReceive}.
		*/
		public void onProfileProvisioningComplete(Context context, Intent intent) {
		public void onProfileProvisioningComplete(@NonNull Context context, @NonNull Intent intent) {
		}

		/**
		@@ -758,7 +764,7 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* @deprecated Do not use
		*/
		@Deprecated
		public void onReadyForUserInitialization(Context context, Intent intent) {
		public void onReadyForUserInitialization(@NonNull Context context, @NonNull Intent intent) {
		}

		/**
		@@ -766,9 +772,10 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		*
		* @param context The running context as per {@link #onReceive}.
		* @param intent The received intent as per {@link #onReceive}.
		* @param pkg If entering, the authorized package using lock task mode, otherwise null.
		* @param pkg The authorized package using lock task mode.
		*/
		public void onLockTaskModeEntering(Context context, Intent intent, String pkg) {
		public void onLockTaskModeEntering(@NonNull Context context, @NonNull Intent intent,
		@NonNull String pkg) {
		}

		/**
		@@ -777,7 +784,7 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* @param context The running context as per {@link #onReceive}.
		* @param intent The received intent as per {@link #onReceive}.
		*/
		public void onLockTaskModeExiting(Context context, Intent intent) {
		public void onLockTaskModeExiting(@NonNull Context context, @NonNull Intent intent) {
		}

		/**
		@@ -787,14 +794,14 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		*
		* @param context The running context as per {@link #onReceive}.
		* @param intent The received intent as per {@link #onReceive}.
		* @param uid The uid asking for the private key and certificate pair.
		* @param uid The uid of the app asking for the private key and certificate pair.
		* @param uri The URI to authenticate, may be null.
		* @param alias The alias preselected by the client, or null.
		* @return The private key alias to return and grant access to.
		* @see KeyChain#choosePrivateKeyAlias
		*/
		public String onChoosePrivateKeyAlias(Context context, Intent intent, int uid, Uri uri,
		String alias) {
		public @Nullable String onChoosePrivateKeyAlias(@NonNull Context context,
		@NonNull Intent intent, int uid, @Nullable Uri uri, @Nullable String alias) {
		return null;
		}

		@@ -818,7 +825,8 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* the current pending update was first available. -1 if no pending update is available.
		* @see DevicePolicyManager#getPendingSystemUpdate
		*/
		public void onSystemUpdatePending(Context context, Intent intent, long receivedTime) {
		public void onSystemUpdatePending(@NonNull Context context, @NonNull Intent intent,
		long receivedTime) {
		}

		/**
		@@ -830,7 +838,7 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* @param intent The received intent as per {@link #onReceive}.
		* @see DevicePolicyManager#requestBugreport
		*/
		public void onBugreportSharingDeclined(Context context, Intent intent) {
		public void onBugreportSharingDeclined(@NonNull Context context, @NonNull Intent intent) {
		}

		/**
		@@ -845,7 +853,8 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* @param bugreportHash SHA-256 hash of the bugreport file.
		* @see DevicePolicyManager#requestBugreport
		*/
		public void onBugreportShared(Context context, Intent intent, String bugreportHash) {
		public void onBugreportShared(@NonNull Context context, @NonNull Intent intent,
		@NonNull String bugreportHash) {
		}

		/**
		@@ -860,7 +869,7 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* or {@link #BUGREPORT_FAILURE_FILE_NO_LONGER_AVAILABLE}
		* @see DevicePolicyManager#requestBugreport
		*/
		public void onBugreportFailed(Context context, Intent intent,
		public void onBugreportFailed(@NonNull Context context, @NonNull Intent intent,
		@BugreportFailureCode int failureCode) {
		}

		@@ -879,7 +888,7 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* @param intent The received intent as per {@link #onReceive}.
		* @see DevicePolicyManager#retrieveSecurityLogs(ComponentName)
		*/
		public void onSecurityLogsAvailable(Context context, Intent intent) {
		public void onSecurityLogsAvailable(@NonNull Context context, @NonNull Intent intent) {
		}

		/**
		@@ -900,8 +909,8 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* @param networkLogsCount The total count of events in the current batch of network logs.
		* @see DevicePolicyManager#retrieveNetworkLogs
		*/
		public void onNetworkLogsAvailable(Context context, Intent intent, long batchToken,
		int networkLogsCount) {
		public void onNetworkLogsAvailable(@NonNull Context context, @NonNull Intent intent,
		long batchToken, @IntRange(from = 1) int networkLogsCount) {
		}

		/**
		@@ -913,7 +922,8 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* @param intent The received intent as per {@link #onReceive}.
		* @param newUser The {@link UserHandle} of the user that has just been added.
		*/
		public void onUserAdded(Context context, Intent intent, @NonNull UserHandle newUser) {
		public void onUserAdded(@NonNull Context context, @NonNull Intent intent,
		@NonNull UserHandle newUser) {
		}

		/**
		@@ -925,7 +935,8 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* @param intent The received intent as per {@link #onReceive}.
		* @param removedUser The {@link UserHandle} of the user that has just been removed.
		*/
		public void onUserRemoved(Context context, Intent intent, @NonNull UserHandle removedUser) {
		public void onUserRemoved(@NonNull Context context, @NonNull Intent intent,
		@NonNull UserHandle removedUser) {
		}

		/**
		@@ -937,7 +948,8 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* @param intent The received intent as per {@link #onReceive}.
		* @param startedUser The {@link UserHandle} of the user that has just been started.
		*/
		public void onUserStarted(Context context, Intent intent, @NonNull UserHandle startedUser) {
		public void onUserStarted(@NonNull Context context, @NonNull Intent intent,
		@NonNull UserHandle startedUser) {
		}

		/**
		@@ -949,7 +961,8 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* @param intent The received intent as per {@link #onReceive}.
		* @param stoppedUser The {@link UserHandle} of the user that has just been stopped.
		*/
		public void onUserStopped(Context context, Intent intent, @NonNull UserHandle stoppedUser) {
		public void onUserStopped(@NonNull Context context, @NonNull Intent intent,
		@NonNull UserHandle stoppedUser) {
		}

		/**
		@@ -961,7 +974,8 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* @param intent The received intent as per {@link #onReceive}.
		* @param switchedUser The {@link UserHandle} of the user that has just been switched to.
		*/
		public void onUserSwitched(Context context, Intent intent, @NonNull UserHandle switchedUser) {
		public void onUserSwitched(@NonNull Context context, @NonNull Intent intent,
		@NonNull UserHandle switchedUser) {
		}

		/**
		@@ -995,7 +1009,8 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* @param user the {@link UserHandle} of the affiliated user
		* @see DevicePolicyManager#transferOwnership(ComponentName, ComponentName, PersistableBundle)
		*/
		public void onTransferAffiliatedProfileOwnershipComplete(Context context, UserHandle user) {
		public void onTransferAffiliatedProfileOwnershipComplete(@NonNull Context context,
		@NonNull UserHandle user) {
		}

		/**
		@@ -1004,7 +1019,7 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* convenience callbacks for each action.
		*/
		@Override
		public void onReceive(Context context, Intent intent) {
		public void onReceive(@NonNull Context context, @NonNull Intent intent) {
		String action = intent.getAction();

		if (ACTION_PASSWORD_CHANGED.equals(action)) {