diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-19 08:28:32 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-05-19 08:28:32 -0700 |
| commit | d6c0bb0f0f3827f1c336db20ac9dc0eb90cd46fa (patch) | |
| tree | 8409eea06150b5892a243b80d7ea407e63310133 /cmds/am/src | |
| parent | aa2fe148496858e17d0ffd2b8d5d29b89d400934 (diff) | |
| parent | 2b9a49a30d2ce1176cbd90741897705bec32d0bd (diff) | |
| download | frameworks_base-d6c0bb0f0f3827f1c336db20ac9dc0eb90cd46fa.zip frameworks_base-d6c0bb0f0f3827f1c336db20ac9dc0eb90cd46fa.tar.gz frameworks_base-d6c0bb0f0f3827f1c336db20ac9dc0eb90cd46fa.tar.bz2 | |
merge from open-source master
Change-Id: I0598edad283a177a5ddcc30e20d2284503e6038e
Diffstat (limited to 'cmds/am/src')
| -rw-r--r-- | cmds/am/src/com/android/commands/am/Am.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/am/src/com/android/commands/am/Am.java b/cmds/am/src/com/android/commands/am/Am.java index 736ac08..301883f 100644 --- a/cmds/am/src/com/android/commands/am/Am.java +++ b/cmds/am/src/com/android/commands/am/Am.java @@ -205,7 +205,7 @@ public class Am { String uri = nextArg(); if (uri != null) { Intent oldIntent = intent; - intent = Intent.getIntent(uri); + intent = Intent.parseUri(uri, 0); if (oldIntent.getAction() != null) { intent.setAction(oldIntent.getAction()); } |