Clear "profile wiped" notification when a new porfile is created

Make use of ACTION_MANAGED_PROFILE_ADDED to clear the notification.

Bug: 22186884

Change-Id: I08514ebc308f2e2fb61f837500e2ba712ccf8703

1 files changed, 9 insertions, 0 deletions

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 0670cd2..5040bd0 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -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) {