merge from open-source master
Change-Id: Ica77cebdbb8880345faeb1ee819f51b0b7ff7a0c
This commit is contained in:
@@ -3519,7 +3519,7 @@ public final class Settings {
|
||||
while (intent == null && c.moveToNext()) {
|
||||
try {
|
||||
String intentURI = c.getString(c.getColumnIndexOrThrow(INTENT));
|
||||
intent = Intent.getIntent(intentURI);
|
||||
intent = Intent.parseUri(intentURI, 0);
|
||||
} catch (java.net.URISyntaxException e) {
|
||||
// The stored URL is bad... ignore it.
|
||||
} catch (IllegalArgumentException e) {
|
||||
@@ -3629,7 +3629,7 @@ public final class Settings {
|
||||
|
||||
Intent intent;
|
||||
try {
|
||||
intent = Intent.getIntent(intentUri);
|
||||
intent = Intent.parseUri(intentUri, 0);
|
||||
} catch (URISyntaxException e) {
|
||||
return "";
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user