summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Sharkey <jsharkey@android.com> 2019-02-15 11:08:21 -0800
committer android-build-merger <android-build-merger@google.com> 2019-02-15 11:08:21 -0800
commitab4fd2936203d2c313ac0fa9cf63873e934de7f2 (patch)
treecf33ed3dc7a492ffff2fa68d09190ebe05958e32
parentb280d76d1f9b431b260e86d01896b98737aeb830 (diff)
parentd6b5de96c20b506fde72e1f9cd1e16965a4625ec (diff)
Merge "No-op flag to keep tests working in this branch." am: 2144164526
am: d6b5de96c2 Change-Id: I4da35d7b8273c20fe625ea79fb135e4d59648e72
-rw-r--r--cmds/am/src/com/android/commands/am/Am.java2
1 files changed, 2 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 c04e61b77274..ca4a184407b4 100644
--- a/cmds/am/src/com/android/commands/am/Am.java
+++ b/cmds/am/src/com/android/commands/am/Am.java
@@ -174,6 +174,8 @@ public class Am extends BaseCommand {
instrument.noWindowAnimation = true;
} else if (opt.equals("--no-hidden-api-checks")) {
instrument.disableHiddenApiChecks = true;
+ } else if (opt.equals("--no-isolated-storage")) {
+ // NOTE: currently a no-op in this branch
} else if (opt.equals("--user")) {
instrument.userId = parseUserArg(nextArgRequired());
} else if (opt.equals("--abi")) {