From e67161b7b6fe174f1189d83eb11696421b7bb53e Mon Sep 17 00:00:00 2001
From: Chloris Kuo <chloriskuo@google.com>
Date: Tue, 20 Apr 2021 19:02:05 -0700
Subject: [PATCH] NAS Setting Migration

Cancel onboarding notification when user migrates from settings

Bug: 185428329
Test: atest NotificationManagerServiceTest, NotificationAssistantsTest
Change-Id: I24941e7e046d4b43978db11b9b58516aeaaf0ef3
---
 core/java/android/app/INotificationManager.aidl            | 2 +-
 .../server/notification/NotificationManagerService.java    | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/java/android/app/INotificationManager.aidl b/core/java/android/app/INotificationManager.aidl
index 35a9f9b509cde..f33adb3c01d1d 100644
--- a/core/java/android/app/INotificationManager.aidl
+++ b/core/java/android/app/INotificationManager.aidl
@@ -189,7 +189,7 @@ interface INotificationManager
     ComponentName getAllowedNotificationAssistantForUser(int userId);
     ComponentName getAllowedNotificationAssistant();
     ComponentName getDefaultNotificationAssistant();
-    void resetDefaultNotificationAssistant(boolean loadFromConfig);
+    void setNASMigrationDoneAndResetDefault(int userId, boolean loadFromConfig);
     boolean hasEnabledNotificationListener(String packageName, int userId);
 
     @UnsupportedAppUsage
diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index 3f8786b395bf7..243fa29c9e58a 100755
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -5179,8 +5179,13 @@ public class NotificationManagerService extends SystemService {
         }
 
         @Override
-        public void resetDefaultNotificationAssistant(boolean loadFromConfig) {
+        public void setNASMigrationDoneAndResetDefault(int userId, boolean loadFromConfig) {
             checkCallerIsSystem();
+            setNASMigrationDone(userId);
+            cancelNotificationInternal(getContext().getPackageName(),
+                    getContext().getOpPackageName(), Binder.getCallingUid(),
+                    Binder.getCallingPid(), TAG,
+                    SystemMessageProto.SystemMessage.NOTE_NAS_UPGRADE, userId);
             if (loadFromConfig) {
                 mAssistants.resetDefaultFromConfig();
             } else {