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

am d7eece34: Merge "Clear identity when requesting current user." into jb-mr1-dev

Browse Source 
* commit 'd7eece3448122fa668cdb386cd47cd1402d12012':
  Clear identity when requesting current user.
This commit is contained in:
Jeff Sharkey
2012-10-05 16:16:00 -07:00
committed by Android Git Automerger
parent 8052e88e1b d7eece3448
commit 39de779d30
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1029,12 +1029,20 @@ public class NotificationManagerService extends INotificationManager.Stub
} }
} }
final int currentUser;
final long token = Binder.clearCallingIdentity();
try {
currentUser = ActivityManager.getCurrentUser();
} finally {
Binder.restoreCallingIdentity(token);
}
// If we're not supposed to beep, vibrate, etc. then don't. // If we're not supposed to beep, vibrate, etc. then don't.
if (((mDisabledNotifications & StatusBarManager.DISABLE_NOTIFICATION_ALERTS) == 0) if (((mDisabledNotifications & StatusBarManager.DISABLE_NOTIFICATION_ALERTS) == 0)
&& (!(old != null && (!(old != null
&& (notification.flags & Notification.FLAG_ONLY_ALERT_ONCE) != 0 )) && (notification.flags & Notification.FLAG_ONLY_ALERT_ONCE) != 0 ))
&& (r.userId == UserHandle.USER_ALL || && (r.userId == UserHandle.USER_ALL ||
(r.userId == userId && r.userId == ActivityManager.getCurrentUser())) (r.userId == userId && r.userId == currentUser))
&& mSystemReady) { && mSystemReady) {
final AudioManager audioManager = (AudioManager) mContext final AudioManager audioManager = (AudioManager) mContext