summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-10-09 19:13:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-09 19:13:13 -0700
commit31af905ac5388339fd0ffd87e6f25bd2a293dc0e (patch)
tree5df9383c80d52c8ae7bb5b04039b6fb67d7f93b0 /cmds
parent24169a6beb6726d34c83521f8c0467b4dbafb0de (diff)
parent36db9d0879640a1cb9a8723d6649068a1c4c08de (diff)
downloadframeworks_base-31af905ac5388339fd0ffd87e6f25bd2a293dc0e.zip
frameworks_base-31af905ac5388339fd0ffd87e6f25bd2a293dc0e.tar.gz
frameworks_base-31af905ac5388339fd0ffd87e6f25bd2a293dc0e.tar.bz2
am 36db9d08: Merge "Further work on issue #7307399: Framework needs a new pre-user-shutdown..." into jb-mr1-dev
* commit '36db9d0879640a1cb9a8723d6649068a1c4c08de': Further work on issue #7307399: Framework needs a new pre-user-shutdown...
Diffstat (limited to 'cmds')
-rw-r--r--cmds/am/src/com/android/commands/am/Am.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/cmds/am/src/com/android/commands/am/Am.java b/cmds/am/src/com/android/commands/am/Am.java
index 3df88bb..add7a23 100644
--- a/cmds/am/src/com/android/commands/am/Am.java
+++ b/cmds/am/src/com/android/commands/am/Am.java
@@ -415,6 +415,10 @@ public class Am {
ComponentName cn = mAm.startService(null, intent, intent.getType(), mUserId);
if (cn == null) {
System.err.println("Error: Not found; no service started.");
+ } else if (cn.getPackageName().equals("!")) {
+ System.err.println("Error: Requires permission " + cn.getClassName());
+ } else if (cn.getPackageName().equals("!!")) {
+ System.err.println("Error: " + cn.getClassName());
}
}