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

Merge "Add multiuser support for enabling notification listener" into oc-mr1-dev

Browse Source
This commit is contained in:
Jaewan Kim
2017-09-29 02:28:49 +00:00
committed by Android (Google) Code Review
parent 4de7ab5cb1 3c45c4c969
commit e98975db32
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5838,8 +5838,8 @@ public class NotificationManagerService extends SystemService {
private class ShellCmd extends ShellCommand {
public static final String USAGE = "help\n"
+ "allow_listener COMPONENT\n"
+ "disallow_listener COMPONENT\n"
+ "allow_listener COMPONENT [user_id]\n"
+ "disallow_listener COMPONENT [user_id]\n"
+ "set_assistant COMPONENT\n"
+ "remove_assistant COMPONENT\n"
+ "allow_dnd PACKAGE\n"
@@ -5870,7 +5870,13 @@ public class NotificationManagerService extends SystemService {
pw.println("Invalid listener - must be a ComponentName");
return -1;
}
getBinderService().setNotificationListenerAccessGranted(cn, true);
String userId = getNextArg();
if (userId == null) {
getBinderService().setNotificationListenerAccessGranted(cn, true);
} else {
getBinderService().setNotificationListenerAccessGrantedForUser(
cn, Integer.parseInt(userId), true);
}
}
break;
case "disallow_listener": {
@@ -5879,7 +5885,13 @@ public class NotificationManagerService extends SystemService {
pw.println("Invalid listener - must be a ComponentName");
return -1;
}
getBinderService().setNotificationListenerAccessGranted(cn, false);
String userId = getNextArg();
if (userId == null) {
getBinderService().setNotificationListenerAccessGranted(cn, false);
} else {
getBinderService().setNotificationListenerAccessGrantedForUser(
cn, Integer.parseInt(userId), false);
}
}
break;
case "allow_assistant": {