Merge "Clear "profile wiped" notification when a new porfile is created" into mnc-dev (be630760) · Commits · e / os / android_frameworks_base

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -390,6 +390,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		} else if (Intent.ACTION_PACKAGE_REMOVED.equals(action)
		&& !intent.getBooleanExtra(Intent.EXTRA_REPLACING, false)) {
		handlePackagesChanged(intent.getData().getSchemeSpecificPart(), userHandle);
		} else if (Intent.ACTION_MANAGED_PROFILE_ADDED.equals(action)) {
		clearWipeProfileNotification();
		}
		}
		};
		@@ -1067,6 +1069,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		filter.addAction(Intent.ACTION_PACKAGE_ADDED);
		filter.addDataScheme("package");
		context.registerReceiverAsUser(mReceiver, UserHandle.ALL, filter, null, mHandler);
		filter = new IntentFilter();
		filter.addAction(Intent.ACTION_MANAGED_PROFILE_ADDED);
		context.registerReceiverAsUser(mReceiver, UserHandle.ALL, filter, null, mHandler);

		LocalServices.addService(DevicePolicyManagerInternal.class, mLocalService);
		}
		@@ -3409,6 +3414,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		getNotificationManager().notify(PROFILE_WIPED_NOTIFICATION_ID, notification);
		}

		private void clearWipeProfileNotification() {
		getNotificationManager().cancel(PROFILE_WIPED_NOTIFICATION_ID);
		}

		@Override
		public void getRemoveWarning(ComponentName comp, final RemoteCallback result, int userHandle) {
		if (!mHasFeature) {