summaryrefslogtreecommitdiffstats
path: root/cmds/am
diff options
context:
space:
mode:
authorWale Ogunwale <ogunwale@google.com>2015-04-16 13:50:44 -0700
committerWale Ogunwale <ogunwale@google.com>2015-04-17 08:37:56 -0700
commit0bd2aa760346edd096f7c27283f394631f246f30 (patch)
treeae3d425b60ea6af8a3e16b8c3580c3df97de0d37 /cmds/am
parent8a2c92c834d4173132aa9fd23fa136d50bf7b0cc (diff)
downloadframeworks_base-0bd2aa760346edd096f7c27283f394631f246f30.zip
frameworks_base-0bd2aa760346edd096f7c27283f394631f246f30.tar.gz
frameworks_base-0bd2aa760346edd096f7c27283f394631f246f30.tar.bz2
Fail early when starting a background user activity.
If it shouldn't be displayed for all users. Bug: 13507605 Change-Id: I8fe8e5a98759c1ca058cc7d222817f6d580ffa11
Diffstat (limited to 'cmds/am')
-rw-r--r--cmds/am/src/com/android/commands/am/Am.java5
1 files changed, 5 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 fa28143..8ba2a5a 100644
--- a/cmds/am/src/com/android/commands/am/Am.java
+++ b/cmds/am/src/com/android/commands/am/Am.java
@@ -857,6 +857,11 @@ public class Am extends BaseCommand {
"Error: Activity not started, voice control not allowed for: "
+ intent);
break;
+ case ActivityManager.START_NOT_CURRENT_USER_ACTIVITY:
+ out.println(
+ "Error: Not allowed to start background user activity"
+ + " that shouldn't be displayed for all users.");
+ break;
default:
out.println(
"Error: Activity not started, unknown error code " + res);