summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dianne Hackborn <hackbod@google.com> 2016-01-07 19:37:37 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-01-07 19:37:37 +0000
commit6b545bb0d89dbe880b2d6144651aa3d370e70c45 (patch)
tree1d09cecdcd6ecb8612617a1a3473173bad87a169
parentaa6555992b9747ac7cc9865f132de20b604f5852 (diff)
parent03a25bd2304b43c6798fb65457f2d4b57776cc26 (diff)
Merge "Fix crashes in background check."
-rwxr-xr-xservices/core/java/com/android/server/am/ActiveServices.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java
index 4348913a2885..9dda32136576 100755
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -1244,7 +1244,7 @@ public final class ActiveServices {
sInfo.applicationInfo.uid, sInfo.packageName, callingPid);
if (allowed != ActivityManager.APP_START_MODE_NORMAL) {
Slog.w(TAG, "Background execution not allowed: service "
- + r.intent + " to " + name.flattenToShortString()
+ + service + " to " + name.flattenToShortString()
+ " from pid=" + callingPid + " uid=" + callingUid
+ " pkg=" + callingPackage);
return null;