Merge "Let device owners handle onChoosePrivateKey" into mnc-dev (58e706d7) · Commits · e / os / android_frameworks_base

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+10 −4

Original line number	Original line	Diff line number	Diff line
	@@ -3231,15 +3231,21 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
	}		}

	final UserHandle caller = Binder.getCallingUserHandle();		final UserHandle caller = Binder.getCallingUserHandle();
	final ComponentName profileOwner = getProfileOwner(caller.getIdentifier());		// If there is a profile owner, redirect to that; otherwise query the device owner.
			ComponentName aliasChooser = getProfileOwner(caller.getIdentifier());
	if (profileOwner == null) {		if (aliasChooser == null && caller.isOwner()) {
			ActiveAdmin deviceOwnerAdmin = getDeviceOwnerAdmin();
			if (deviceOwnerAdmin != null) {
			aliasChooser = deviceOwnerAdmin.info.getComponent();
			}
			}
			if (aliasChooser == null) {
	sendPrivateKeyAliasResponse(null, response);		sendPrivateKeyAliasResponse(null, response);
	return;		return;
	}		}

	Intent intent = new Intent(DeviceAdminReceiver.ACTION_CHOOSE_PRIVATE_KEY_ALIAS);		Intent intent = new Intent(DeviceAdminReceiver.ACTION_CHOOSE_PRIVATE_KEY_ALIAS);
	intent.setComponent(profileOwner);		intent.setComponent(aliasChooser);
	intent.putExtra(DeviceAdminReceiver.EXTRA_CHOOSE_PRIVATE_KEY_SENDER_UID, uid);		intent.putExtra(DeviceAdminReceiver.EXTRA_CHOOSE_PRIVATE_KEY_SENDER_UID, uid);
	intent.putExtra(DeviceAdminReceiver.EXTRA_CHOOSE_PRIVATE_KEY_URI, uri);		intent.putExtra(DeviceAdminReceiver.EXTRA_CHOOSE_PRIVATE_KEY_URI, uri);
	intent.putExtra(DeviceAdminReceiver.EXTRA_CHOOSE_PRIVATE_KEY_ALIAS, alias);		intent.putExtra(DeviceAdminReceiver.EXTRA_CHOOSE_PRIVATE_KEY_ALIAS, alias);