commit | 50572be3617b87e88d3bdd1b3f383b8380e3b33a | [log] [tgz] |
---|---|---|
author | Alan Viverette <alanv@google.com> | Thu Sep 18 20:54:43 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Sep 18 20:54:44 2014 +0000 |
tree | c030d623217ccf1679c2ff0ab16e59a48bb45568 | |
parent | 688a994f4d156db6a9310c438545f014accba5ed [diff] | |
parent | 0adf32bc1e82e4f5d4b531d97c3ef94f21853f61 [diff] |
Merge "Fix parsing of old-style intent URIs" into lmp-dev
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index ff9f6ab..53912e1 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java
@@ -4295,7 +4295,7 @@ int j = uri.indexOf(')', i); while (i < j) { int sep = uri.indexOf('!', i); - if (sep < 0) sep = j; + if (sep < 0 || sep > j) sep = j; if (i < sep) { intent.addCategory(uri.substring(i, sep)); }