summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/am/ActivityManagerService.java
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2009-09-01 13:52:19 -0700
committerJean-Baptiste Queru <jbq@google.com>2009-09-01 13:52:19 -0700
commit1ffc20b948b059e73497da8babb9671b24eb9ed1 (patch)
tree9f302eecaf0a32f592a4d088f39729e73b260cf6 /services/java/com/android/server/am/ActivityManagerService.java
parent334ef5484bc5e427ebcd8c1641cc5dd799affec2 (diff)
parent85a2c7f1cad8fd55ed72a8a3dbb2b36632ebbff3 (diff)
downloadframeworks_base-1ffc20b948b059e73497da8babb9671b24eb9ed1.zip
frameworks_base-1ffc20b948b059e73497da8babb9671b24eb9ed1.tar.gz
frameworks_base-1ffc20b948b059e73497da8babb9671b24eb9ed1.tar.bz2
manual merge of 85a2c7f because of trivial conflict
Diffstat (limited to 'services/java/com/android/server/am/ActivityManagerService.java')
-rw-r--r--services/java/com/android/server/am/ActivityManagerService.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index 91e288b..dfad467 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -5877,6 +5877,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
}
// If the target requires a specific UID, always fail for others.
if (reqUid >= 0 && uid != reqUid) {
+ Log.w(TAG, "Permission denied: checkComponentPermission() reqUid=" + reqUid);
return PackageManager.PERMISSION_DENIED;
}
if (permission == null) {