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

am f3e2f8fe: am 9eb434c3: Allow the user to block notifications for foreground services.

Browse Source 
* commit 'f3e2f8feef1a22708cc7ce1a7bc5d914bb53933d':
  Allow the user to block notifications for foreground services.
This commit is contained in:
Daniel Sandler
2013-08-01 09:32:40 -07:00
committed by Android Git Automerger
parent 368d81fe18 f3e2f8feef
commit 9e6f26a8e1
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/java/com/android/server/NotificationManagerService.java
View File

@@ -1606,7 +1606,7 @@ public class NotificationManagerService extends INotificationManager.Stub
Slog.v(TAG, "enqueueNotificationInternal: pkg=" + pkg + " id=" + id + " notification=" + notification);
}
checkCallerIsSystemOrSameApp(pkg);
final boolean isSystemNotification = isCallerSystem() || ("android".equals(pkg));
final boolean isSystemNotification = isUidSystem(callingUid) || ("android".equals(pkg));
userId = ActivityManager.handleIncomingUser(callingPid,
callingUid, userId, true, false, "enqueueNotification", pkg);
@@ -2084,14 +2084,18 @@ public class NotificationManagerService extends INotificationManager.Stub
cancelAllNotificationsInt(pkg, 0, Notification.FLAG_FOREGROUND_SERVICE, true, userId);
}
// Return true if the caller is a system or phone UID and therefore should not have
// Return true if the UID is a system or phone UID and therefore should not have
// any notifications or toasts blocked.
boolean isCallerSystem() {
final int uid = Binder.getCallingUid();
boolean isUidSystem(int uid) {
final int appid = UserHandle.getAppId(uid);
return (appid == Process.SYSTEM_UID || appid == Process.PHONE_UID || uid == 0);
}
// same as isUidSystem(int, int) for the Binder caller's UID.
boolean isCallerSystem() {
return isUidSystem(Binder.getCallingUid());
}
void checkCallerIsSystem() {
if (isCallerSystem()) {
return;