commit 53129f1c21fc1e404f8e1d5772954710e6442dd8
author Jeff Sharkey <jsharkey@google.com> Wed Dec 16 17:57:17 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 16 17:57:17 2015 +0000
tree a8ef0efcd25088050f03cfe7be01fefc4fe0bf37
parent ec87623afbbff9d6113b34a0bfc45d63e53dae82
parent caf9f4926662558e030db68df89775de2a5653bd

Merge "Relax isUserRunning() when asking about self."

services/core/java/com/android/server/am/ActivityManagerService.java

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 927a7b6..d8724b27 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -20453,8 +20453,8 @@
 
     @Override
     public boolean isUserRunning(int userId, int flags) {
-        if (checkCallingPermission(INTERACT_ACROSS_USERS)
-                != PackageManager.PERMISSION_GRANTED) {
+        if (userId != UserHandle.getCallingUserId() && checkCallingPermission(
+                INTERACT_ACROSS_USERS) != PackageManager.PERMISSION_GRANTED) {
             String msg = "Permission Denial: isUserRunning() from pid="
                     + Binder.getCallingPid()
                     + ", uid=" + Binder.getCallingUid()