Merge "replaced deprecated getIntent with parseURI"

Author: Jean-Baptiste Queru

core/java/android/provider/Settings.java

@@ -3779,7 +3779,7 @@ public static Intent getIntentForShortcut(ContentResolver cr, char shortcut)
                 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) {
@@ -3889,7 +3889,7 @@ public static CharSequence getTitle(Context context, Cursor cursor) {
 
             Intent intent;
             try {
-                intent = Intent.getIntent(intentUri);
+                intent = Intent.parseUri(intentUri, 0);
             } catch (URISyntaxException e) {
                 return "";
             }