Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c08e1a4e authored by Chloris Kuo's avatar Chloris Kuo Committed by Android (Google) Code Review
Browse files

Merge "NAS Setting Migration" into sc-dev

parents f0a78473 e67161b7

core/java/android/app/INotificationManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -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

services/core/java/com/android/server/notification/NotificationManagerService.java

+6 −1
Original line number Diff line number Diff line
@@ -5177,8 +5177,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 {