Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "NAS Setting Migration" into sc-dev

Browse Source
This commit is contained in:
Chloris Kuo
2021-04-22 00:23:25 +00:00
committed by Android (Google) Code Review
parent f0a7847318 e67161b7b6
commit c08e1a4eda
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/INotificationManager.aidl
View File

@@ -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

7
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -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 {