summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-05-19 08:33:27 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-19 08:33:27 -0700
commit627356cee467fad0335b2bc8cc058a3784f0bf63 (patch)
tree8e0e58c9124fd384217fc74851114ddb8a66c329 /cmds
parent0b6defefb961b2c61ac50f16185f35cef1de870e (diff)
parentd6c0bb0f0f3827f1c336db20ac9dc0eb90cd46fa (diff)
downloadframeworks_base-627356cee467fad0335b2bc8cc058a3784f0bf63.zip
frameworks_base-627356cee467fad0335b2bc8cc058a3784f0bf63.tar.gz
frameworks_base-627356cee467fad0335b2bc8cc058a3784f0bf63.tar.bz2
am d6c0bb0f: merge from open-source master
Merge commit 'd6c0bb0f0f3827f1c336db20ac9dc0eb90cd46fa' into kraken * commit 'd6c0bb0f0f3827f1c336db20ac9dc0eb90cd46fa': Removed Calls to deprecated APIs
Diffstat (limited to 'cmds')
-rw-r--r--cmds/am/src/com/android/commands/am/Am.java2
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());
}