Merge "Allow the device initializer to perform user setup tasks." (aa7e7318) · Commits · e / os / android_frameworks_base

api/current.txt

+11 −0

api/system-current.txt

+12 −0

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

+53 −9

Original line number	Original line	Diff line number	Diff line
	@@ -215,7 +215,8 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
	* <p>A device admin application which listens to this intent can find out if the device was		* <p>A device admin application which listens to this intent can find out if the device was
	* provisioned for the device owner or profile owner case by calling respectively		* provisioned for the device owner or profile owner case by calling respectively
	* {@link android.app.admin.DevicePolicyManager#isDeviceOwnerApp} and		* {@link android.app.admin.DevicePolicyManager#isDeviceOwnerApp} and
	* {@link android.app.admin.DevicePolicyManager#isProfileOwnerApp}.		* {@link android.app.admin.DevicePolicyManager#isProfileOwnerApp}. You will generally handle
			* this in {@link DeviceAdminReceiver#onProfileProvisioningComplete}.
	*		*
	* <p>Input: Nothing.</p>		* <p>Input: Nothing.</p>
	* <p>Output: Nothing</p>		* <p>Output: Nothing</p>
	@@ -224,6 +225,23 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
	public static final String ACTION_PROFILE_PROVISIONING_COMPLETE =		public static final String ACTION_PROFILE_PROVISIONING_COMPLETE =
	"android.app.action.PROFILE_PROVISIONING_COMPLETE";		"android.app.action.PROFILE_PROVISIONING_COMPLETE";

			/**
			* Broadcast Action: This broadcast is sent to indicate that the system is ready for the device
			* initializer to perform user setup tasks. This is only applicable to devices managed by a
			* device owner app.
			*
			* <p>The broadcast will be limited to the {@link DeviceAdminReceiver} component specified in
			* the (@link DevicePolicyManager#EXTRA_PROVISIONING_DEVICE_INITIALIZER_COMPONENT_NAME) field
			* of the original intent or NFC bump that started the provisioning process. You will generally
			* handle this in {@link DeviceAdminReceiver#onReadyForUserInitialization}.
			*
			* <p>Input: Nothing.</p>
			* <p>Output: Nothing</p>
			*/
			@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
			public static final String ACTION_READY_FOR_USER_INITIALIZATION =
			"android.app.action.READY_FOR_USER_INITIALIZATION";

	/** @hide */		/** @hide */
	public static final String ACTION_CHOOSE_PRIVATE_KEY_ALIAS = "android.app.action.CHOOSE_PRIVATE_KEY_ALIAS";		public static final String ACTION_CHOOSE_PRIVATE_KEY_ALIAS = "android.app.action.CHOOSE_PRIVATE_KEY_ALIAS";

	@@ -382,20 +400,20 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
	/**		/**
	* Called when provisioning of a managed profile or managed device has completed successfully.		* Called when provisioning of a managed profile or managed device has completed successfully.
	*		*
	* <p> As a prerequisit for the execution of this callback the (@link DeviceAdminReceiver} has		* <p> As a prerequisite for the execution of this callback the {@link DeviceAdminReceiver} has
	* to declare an intent filter for {@link #ACTION_PROFILE_PROVISIONING_COMPLETE}.		* to declare an intent filter for {@link #ACTION_PROFILE_PROVISIONING_COMPLETE}.
	* Its component must also be specified in the {@link DevicePolicyManager#EXTRA_DEVICE_ADMIN}		* Its component must also be specified in the {@link DevicePolicyManager#EXTRA_DEVICE_ADMIN}
	* of the {@link DevicePolicyManager#ACTION_PROVISION_MANAGED_PROFILE} intent that started the		* of the {@link DevicePolicyManager#ACTION_PROVISION_MANAGED_PROFILE} intent that started the
	* managed provisioning.		* managed provisioning.
	*		*
	* <p>When provisioning is complete, the managed profile is hidden until the profile owner		* <p>When provisioning of a managed profile is complete, the managed profile is hidden until
	* calls {DevicePolicyManager#setProfileEnabled(ComponentName admin)}. Typically a profile		* the profile owner calls {DevicePolicyManager#setProfileEnabled(ComponentName admin)}.
	* owner will enable the profile when it has finished any additional setup such as adding an		* Typically a profile owner will enable the profile when it has finished any additional setup
	* account by using the {@link AccountManager} and calling apis to bring the profile into the		* such as adding an account by using the {@link AccountManager} and calling apis to bring the
	* desired state.		* profile into the desired state.
	*		*
	* <p> Note that provisioning completes without waiting for any server interactions, so the		* <p> Note that provisioning completes without waiting for any server interactions, so the
	* profile owner needs to wait for data to be available if required (e.g android device ids or		* profile owner needs to wait for data to be available if required (e.g. android device ids or
	* other data that is set as a result of server interactions).		* other data that is set as a result of server interactions).
	*		*
	* @param context The running context as per {@link #onReceive}.		* @param context The running context as per {@link #onReceive}.
	@@ -404,6 +422,30 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
	public void onProfileProvisioningComplete(Context context, Intent intent) {		public void onProfileProvisioningComplete(Context context, Intent intent) {
	}		}

			/**
			* Called during provisioning of a managed device to allow the device initializer to perform
			* user setup steps. Only device initializers should override this method.
			*
			* <p> Called when the DeviceAdminReceiver receives a
			* {@link #ACTION_READY_FOR_USER_INITIALIZATION} broadcast. As a prerequisite for the execution
			* of this callback the {@link DeviceAdminReceiver} has
			* to declare an intent filter for {@link #ACTION_READY_FOR_USER_INITIALIZATION}. Only the
			* component specified in the
			* {@link DevicePolicyManager#EXTRA_PROVISIONING_DEVICE_INITIALIZER_COMPONENT_NAME} field of the
			* original intent or NFC bump that started the provisioning process will receive this callback.
			*
			* <p>It is not assumed that the device initializer is finished when it returns from
			* this call, as it may do additional setup asynchronously. The device initializer must call
			* {DevicePolicyManager#setUserEnabled(ComponentName admin)} when it has finished any additional
			* setup (such as adding an account by using the {@link AccountManager}) in order for the user
			* to be functional.
			*
			* @param context The running context as per {@link #onReceive}.
			* @param intent The received intent as per {@link #onReceive}.
			*/
			public void onReadyForUserInitialization(Context context, Intent intent) {
			}

	/**		/**
	* Called when a device is entering lock task mode by a package authorized		* Called when a device is entering lock task mode by a package authorized
	* by {@link DevicePolicyManager#isLockTaskPermitted(String)}		* by {@link DevicePolicyManager#isLockTaskPermitted(String)}
	@@ -488,6 +530,8 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
	onLockTaskModeEntering(context, intent, pkg);		onLockTaskModeEntering(context, intent, pkg);
	} else if (ACTION_LOCK_TASK_EXITING.equals(action)) {		} else if (ACTION_LOCK_TASK_EXITING.equals(action)) {
	onLockTaskModeExiting(context, intent);		onLockTaskModeExiting(context, intent);
			} else if (ACTION_READY_FOR_USER_INITIALIZATION.equals(action)) {
			onReadyForUserInitialization(context, intent);
	}		}
	}		}
	}		}

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

+158 −9

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/app/admin/IDevicePolicyManager.aidl

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -199,4 +199,10 @@ interface IDevicePolicyManager {
	boolean getAutoTimeRequired();		boolean getAutoTimeRequired();

	boolean isRemovingAdmin(in ComponentName adminReceiver, int userHandle);		boolean isRemovingAdmin(in ComponentName adminReceiver, int userHandle);

			boolean setUserEnabled(in ComponentName who);
			boolean isDeviceInitializer(String packageName);
			void clearDeviceInitializer(String packageName);
			boolean setDeviceInitializer(in ComponentName who, in ComponentName initializer, String initializerName);
			String getDeviceInitializer();
	}		}

Original line number	Original line	Diff line number	Diff line
	@@ -5429,6 +5429,7 @@ package android.app.admin {
	method public void onPasswordFailed(android.content.Context, android.content.Intent);		method public void onPasswordFailed(android.content.Context, android.content.Intent);
	method public void onPasswordSucceeded(android.content.Context, android.content.Intent);		method public void onPasswordSucceeded(android.content.Context, android.content.Intent);
	method public void onProfileProvisioningComplete(android.content.Context, android.content.Intent);		method public void onProfileProvisioningComplete(android.content.Context, android.content.Intent);
			method public void onReadyForUserInitialization(android.content.Context, android.content.Intent);
	method public void onReceive(android.content.Context, android.content.Intent);		method public void onReceive(android.content.Context, android.content.Intent);
	field public static final java.lang.String ACTION_DEVICE_ADMIN_DISABLED = "android.app.action.DEVICE_ADMIN_DISABLED";		field public static final java.lang.String ACTION_DEVICE_ADMIN_DISABLED = "android.app.action.DEVICE_ADMIN_DISABLED";
	field public static final java.lang.String ACTION_DEVICE_ADMIN_DISABLE_REQUESTED = "android.app.action.DEVICE_ADMIN_DISABLE_REQUESTED";		field public static final java.lang.String ACTION_DEVICE_ADMIN_DISABLE_REQUESTED = "android.app.action.DEVICE_ADMIN_DISABLE_REQUESTED";
	@@ -5440,6 +5441,7 @@ package android.app.admin {
	field public static final java.lang.String ACTION_PASSWORD_FAILED = "android.app.action.ACTION_PASSWORD_FAILED";		field public static final java.lang.String ACTION_PASSWORD_FAILED = "android.app.action.ACTION_PASSWORD_FAILED";
	field public static final java.lang.String ACTION_PASSWORD_SUCCEEDED = "android.app.action.ACTION_PASSWORD_SUCCEEDED";		field public static final java.lang.String ACTION_PASSWORD_SUCCEEDED = "android.app.action.ACTION_PASSWORD_SUCCEEDED";
	field public static final java.lang.String ACTION_PROFILE_PROVISIONING_COMPLETE = "android.app.action.PROFILE_PROVISIONING_COMPLETE";		field public static final java.lang.String ACTION_PROFILE_PROVISIONING_COMPLETE = "android.app.action.PROFILE_PROVISIONING_COMPLETE";
			field public static final java.lang.String ACTION_READY_FOR_USER_INITIALIZATION = "android.app.action.READY_FOR_USER_INITIALIZATION";
	field public static final java.lang.String DEVICE_ADMIN_META_DATA = "android.app.device_admin";		field public static final java.lang.String DEVICE_ADMIN_META_DATA = "android.app.device_admin";
	field public static final java.lang.String EXTRA_DISABLE_WARNING = "android.app.extra.DISABLE_WARNING";		field public static final java.lang.String EXTRA_DISABLE_WARNING = "android.app.extra.DISABLE_WARNING";
	field public static final java.lang.String EXTRA_LOCK_TASK_PACKAGE = "android.app.extra.LOCK_TASK_PACKAGE";		field public static final java.lang.String EXTRA_LOCK_TASK_PACKAGE = "android.app.extra.LOCK_TASK_PACKAGE";
	@@ -5451,6 +5453,7 @@ package android.app.admin {
	method public void addPersistentPreferredActivity(android.content.ComponentName, android.content.IntentFilter, android.content.ComponentName);		method public void addPersistentPreferredActivity(android.content.ComponentName, android.content.IntentFilter, android.content.ComponentName);
	method public void addUserRestriction(android.content.ComponentName, java.lang.String);		method public void addUserRestriction(android.content.ComponentName, java.lang.String);
	method public void clearCrossProfileIntentFilters(android.content.ComponentName);		method public void clearCrossProfileIntentFilters(android.content.ComponentName);
			method public void clearDeviceInitializerApp();
	method public void clearDeviceOwnerApp(java.lang.String);		method public void clearDeviceOwnerApp(java.lang.String);
	method public void clearPackagePersistentPreferredActivities(android.content.ComponentName, java.lang.String);		method public void clearPackagePersistentPreferredActivities(android.content.ComponentName, java.lang.String);
	method public void clearUserRestriction(android.content.ComponentName, java.lang.String);		method public void clearUserRestriction(android.content.ComponentName, java.lang.String);
	@@ -5489,11 +5492,13 @@ package android.app.admin {
	method public int getStorageEncryptionStatus();		method public int getStorageEncryptionStatus();
	method public boolean hasCaCertInstalled(android.content.ComponentName, byte[]);		method public boolean hasCaCertInstalled(android.content.ComponentName, byte[]);
	method public boolean hasGrantedPolicy(android.content.ComponentName, int);		method public boolean hasGrantedPolicy(android.content.ComponentName, int);
			method public boolean hasUserSetupCompleted();
	method public boolean installCaCert(android.content.ComponentName, byte[]);		method public boolean installCaCert(android.content.ComponentName, byte[]);
	method public boolean installKeyPair(android.content.ComponentName, java.security.PrivateKey, java.security.cert.Certificate, java.lang.String);		method public boolean installKeyPair(android.content.ComponentName, java.security.PrivateKey, java.security.cert.Certificate, java.lang.String);
	method public boolean isActivePasswordSufficient();		method public boolean isActivePasswordSufficient();
	method public boolean isAdminActive(android.content.ComponentName);		method public boolean isAdminActive(android.content.ComponentName);
	method public boolean isApplicationHidden(android.content.ComponentName, java.lang.String);		method public boolean isApplicationHidden(android.content.ComponentName, java.lang.String);
			method public boolean isDeviceInitializerApp(java.lang.String);
	method public boolean isDeviceOwnerApp(java.lang.String);		method public boolean isDeviceOwnerApp(java.lang.String);
	method public boolean isLockTaskPermitted(java.lang.String);		method public boolean isLockTaskPermitted(java.lang.String);
	method public boolean isMasterVolumeMuted(android.content.ComponentName);		method public boolean isMasterVolumeMuted(android.content.ComponentName);
	@@ -5510,6 +5515,7 @@ package android.app.admin {
	method public void setAutoTimeRequired(android.content.ComponentName, boolean);		method public void setAutoTimeRequired(android.content.ComponentName, boolean);

Original line number	Original line	Diff line number	Diff line
	@@ -5523,6 +5523,7 @@ package android.app.admin {
	method public void onPasswordFailed(android.content.Context, android.content.Intent);		method public void onPasswordFailed(android.content.Context, android.content.Intent);
	method public void onPasswordSucceeded(android.content.Context, android.content.Intent);		method public void onPasswordSucceeded(android.content.Context, android.content.Intent);
	method public void onProfileProvisioningComplete(android.content.Context, android.content.Intent);		method public void onProfileProvisioningComplete(android.content.Context, android.content.Intent);
			method public void onReadyForUserInitialization(android.content.Context, android.content.Intent);
	method public void onReceive(android.content.Context, android.content.Intent);		method public void onReceive(android.content.Context, android.content.Intent);
	field public static final java.lang.String ACTION_DEVICE_ADMIN_DISABLED = "android.app.action.DEVICE_ADMIN_DISABLED";		field public static final java.lang.String ACTION_DEVICE_ADMIN_DISABLED = "android.app.action.DEVICE_ADMIN_DISABLED";
	field public static final java.lang.String ACTION_DEVICE_ADMIN_DISABLE_REQUESTED = "android.app.action.DEVICE_ADMIN_DISABLE_REQUESTED";		field public static final java.lang.String ACTION_DEVICE_ADMIN_DISABLE_REQUESTED = "android.app.action.DEVICE_ADMIN_DISABLE_REQUESTED";
	@@ -5534,6 +5535,7 @@ package android.app.admin {
	field public static final java.lang.String ACTION_PASSWORD_FAILED = "android.app.action.ACTION_PASSWORD_FAILED";		field public static final java.lang.String ACTION_PASSWORD_FAILED = "android.app.action.ACTION_PASSWORD_FAILED";
	field public static final java.lang.String ACTION_PASSWORD_SUCCEEDED = "android.app.action.ACTION_PASSWORD_SUCCEEDED";		field public static final java.lang.String ACTION_PASSWORD_SUCCEEDED = "android.app.action.ACTION_PASSWORD_SUCCEEDED";
	field public static final java.lang.String ACTION_PROFILE_PROVISIONING_COMPLETE = "android.app.action.PROFILE_PROVISIONING_COMPLETE";		field public static final java.lang.String ACTION_PROFILE_PROVISIONING_COMPLETE = "android.app.action.PROFILE_PROVISIONING_COMPLETE";
			field public static final java.lang.String ACTION_READY_FOR_USER_INITIALIZATION = "android.app.action.READY_FOR_USER_INITIALIZATION";
	field public static final java.lang.String DEVICE_ADMIN_META_DATA = "android.app.device_admin";		field public static final java.lang.String DEVICE_ADMIN_META_DATA = "android.app.device_admin";
	field public static final java.lang.String EXTRA_DISABLE_WARNING = "android.app.extra.DISABLE_WARNING";		field public static final java.lang.String EXTRA_DISABLE_WARNING = "android.app.extra.DISABLE_WARNING";
	field public static final java.lang.String EXTRA_LOCK_TASK_PACKAGE = "android.app.extra.LOCK_TASK_PACKAGE";		field public static final java.lang.String EXTRA_LOCK_TASK_PACKAGE = "android.app.extra.LOCK_TASK_PACKAGE";
	@@ -5545,6 +5547,7 @@ package android.app.admin {
	method public void addPersistentPreferredActivity(android.content.ComponentName, android.content.IntentFilter, android.content.ComponentName);		method public void addPersistentPreferredActivity(android.content.ComponentName, android.content.IntentFilter, android.content.ComponentName);
	method public void addUserRestriction(android.content.ComponentName, java.lang.String);		method public void addUserRestriction(android.content.ComponentName, java.lang.String);
	method public void clearCrossProfileIntentFilters(android.content.ComponentName);		method public void clearCrossProfileIntentFilters(android.content.ComponentName);
			method public void clearDeviceInitializerApp();
	method public void clearDeviceOwnerApp(java.lang.String);		method public void clearDeviceOwnerApp(java.lang.String);
	method public void clearPackagePersistentPreferredActivities(android.content.ComponentName, java.lang.String);		method public void clearPackagePersistentPreferredActivities(android.content.ComponentName, java.lang.String);
	method public void clearProfileOwner(android.content.ComponentName);		method public void clearProfileOwner(android.content.ComponentName);
	@@ -5561,6 +5564,7 @@ package android.app.admin {
	method public boolean getCrossProfileCallerIdDisabled(android.content.ComponentName);		method public boolean getCrossProfileCallerIdDisabled(android.content.ComponentName);
	method public java.util.List<java.lang.String> getCrossProfileWidgetProviders(android.content.ComponentName);		method public java.util.List<java.lang.String> getCrossProfileWidgetProviders(android.content.ComponentName);
	method public int getCurrentFailedPasswordAttempts();		method public int getCurrentFailedPasswordAttempts();
			method public java.lang.String getDeviceInitializerApp();
	method public java.lang.String getDeviceOwner();		method public java.lang.String getDeviceOwner();
	method public java.util.List<byte[]> getInstalledCaCerts(android.content.ComponentName);		method public java.util.List<byte[]> getInstalledCaCerts(android.content.ComponentName);
	method public int getKeyguardDisabledFeatures(android.content.ComponentName);		method public int getKeyguardDisabledFeatures(android.content.ComponentName);
	@@ -5589,11 +5593,13 @@ package android.app.admin {
	method public int getStorageEncryptionStatus();		method public int getStorageEncryptionStatus();
	method public boolean hasCaCertInstalled(android.content.ComponentName, byte[]);		method public boolean hasCaCertInstalled(android.content.ComponentName, byte[]);
	method public boolean hasGrantedPolicy(android.content.ComponentName, int);		method public boolean hasGrantedPolicy(android.content.ComponentName, int);
			method public boolean hasUserSetupCompleted();
	method public boolean installCaCert(android.content.ComponentName, byte[]);		method public boolean installCaCert(android.content.ComponentName, byte[]);
	method public boolean installKeyPair(android.content.ComponentName, java.security.PrivateKey, java.security.cert.Certificate, java.lang.String);		method public boolean installKeyPair(android.content.ComponentName, java.security.PrivateKey, java.security.cert.Certificate, java.lang.String);
	method public boolean isActivePasswordSufficient();		method public boolean isActivePasswordSufficient();