Merge "Send admin enabled broadcast in foreground queue" (79abc1da) · Commits · e / os / android_frameworks_base

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

+39 −10

Original line number	Diff line number	Diff line
		@@ -615,11 +615,15 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		}
		} else if (Intent.ACTION_USER_STARTED.equals(action)) {
		synchronized (DevicePolicyManagerService.this) {
		maybeSendAdminEnabledBroadcastLocked(userHandle);
		// Reset the policy data
		mUserData.remove(userHandle);
		sendAdminEnabledBroadcastLocked(userHandle);
		}
		handlePackagesChanged(null /* check all admins */, userHandle);
		} else if (Intent.ACTION_USER_UNLOCKED.equals(action)) {
		synchronized (DevicePolicyManagerService.this) {
		maybeSendAdminEnabledBroadcastLocked(userHandle);
		}
		} else if (Intent.ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE.equals(action)) {
		handlePackagesChanged(null /* check all admins */, userHandle);
		} else if (Intent.ACTION_PACKAGE_CHANGED.equals(action)
		@@ -1855,6 +1859,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		filter.addAction(Intent.ACTION_USER_ADDED);
		filter.addAction(Intent.ACTION_USER_REMOVED);
		filter.addAction(Intent.ACTION_USER_STARTED);
		filter.addAction(Intent.ACTION_USER_UNLOCKED);
		filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);
		mContext.registerReceiverAsUser(mReceiver, UserHandle.ALL, filter, null, mHandler);
		filter = new IntentFilter();
		@@ -2373,11 +2378,18 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		sendAdminCommandLocked(admin, action, null, result);
		}

		void sendAdminCommandLocked(ActiveAdmin admin, String action, Bundle adminExtras,
		BroadcastReceiver result) {
		sendAdminCommandLocked(admin, action, adminExtras, result, false);
		}

		/**
		* Send an update to one specific admin, get notified when that admin returns a result.
		*
		* @return whether the broadcast was successfully sent
		*/
		void sendAdminCommandLocked(ActiveAdmin admin, String action, Bundle adminExtras,
		BroadcastReceiver result) {
		boolean sendAdminCommandLocked(ActiveAdmin admin, String action, Bundle adminExtras,
		BroadcastReceiver result, boolean inForeground) {
		Intent intent = new Intent(action);
		intent.setComponent(admin.info.getComponent());
		if (UserManager.isDeviceInDemoMode(mContext)) {
		@@ -2386,15 +2398,25 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		if (action.equals(DeviceAdminReceiver.ACTION_PASSWORD_EXPIRING)) {
		intent.putExtra("expiration", admin.passwordExpirationDate);
		}
		if (inForeground) {
		intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
		}
		if (adminExtras != null) {
		intent.putExtras(adminExtras);
		}
		if (mInjector.getPackageManager().queryBroadcastReceiversAsUser(
		intent,
		PackageManager.MATCH_DEBUG_TRIAGED_MISSING,
		admin.getUserHandle()).isEmpty()) {
		return false;
		}
		if (result != null) {
		mContext.sendOrderedBroadcastAsUser(intent, admin.getUserHandle(),
		null, result, mHandler, Activity.RESULT_OK, null, null);
		} else {
		mContext.sendBroadcastAsUser(intent, admin.getUserHandle());
		}
		return true;
		}

		/**
		@@ -8100,22 +8122,29 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		}
		}


		private void sendAdminEnabledBroadcastLocked(int userHandle) {
		private void maybeSendAdminEnabledBroadcastLocked(int userHandle) {
		DevicePolicyData policyData = getUserData(userHandle);
		if (policyData.mAdminBroadcastPending) {
		// Send the initialization data to profile owner and delete the data
		ActiveAdmin admin = getProfileOwnerAdminLocked(userHandle);
		boolean clearInitBundle = true;
		if (admin != null) {
		PersistableBundle initBundle = policyData.mInitBundle;
		sendAdminCommandLocked(admin, DeviceAdminReceiver.ACTION_DEVICE_ADMIN_ENABLED,
		initBundle == null ? null : new Bundle(initBundle), null);
		}
		clearInitBundle = sendAdminCommandLocked(admin,
		DeviceAdminReceiver.ACTION_DEVICE_ADMIN_ENABLED,
		initBundle == null ? null : new Bundle(initBundle),
		null /* result receiver */,
		true /* send in foreground */);
		}
		if (clearInitBundle) {
		// If there's no admin or we've successfully called the admin, clear the init bundle
		// otherwise, keep it around
		policyData.mInitBundle = null;
		policyData.mAdminBroadcastPending = false;
		saveSettingsLocked(userHandle);
		}
		}
		}

		@Override
		public UserHandle createAndManageUser(ComponentName admin, String name,

services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@ import android.content.Intent;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.PackageInfo;
		import android.content.pm.PackageManager;
		import android.content.pm.ResolveInfo;
		import android.content.pm.StringParceledListSlice;
		import android.content.pm.UserInfo;
		import android.graphics.Color;
		@@ -166,6 +167,11 @@ public class DevicePolicyManagerTest extends DpmTestBase {
		mServiceContext.binder.callingUid = DpmMockContext.CALLER_UID;
		when(getServices().packageManager.hasSystemFeature(eq(PackageManager.FEATURE_DEVICE_ADMIN)))
		.thenReturn(true);
		doReturn(Collections.singletonList(new ResolveInfo()))
		.when(getServices().packageManager).queryBroadcastReceiversAsUser(
		any(Intent.class),
		anyInt(),
		any(UserHandle.class));

		// By default, pretend all users are running and unlocked.
		when(getServices().userManager.isUserUnlocked(anyInt())).thenReturn(true);