Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7b81418 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

merge from open-source master 

Change-Id: Ica77cebdbb8880345faeb1ee819f51b0b7ff7a0c
parents 51a9839e 4bd00732

core/java/android/provider/Settings.java

+2 −2
Original line number Diff line number Diff line
@@ -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 "";

            }