Skip to content

Commit e6af73e

Browse files
firefartJean-Baptiste Queru
authored andcommitted
Replaced deprecated Inten.toURI method
Change-Id: Iff3200294edbc1cac188502219bfe481133a5d8e
1 parent baccb91 commit e6af73e

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

core/java/android/app/ApplicationContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1972,7 +1972,7 @@ public List<InstrumentationInfo> queryInstrumentation(
19721972
return info.activityInfo.loadIcon(this);
19731973
}
19741974

1975-
throw new NameNotFoundException(intent.toURI());
1975+
throw new NameNotFoundException(intent.toUri(0));
19761976
}
19771977

19781978
@Override public Drawable getDefaultActivityIcon() {

core/java/android/app/SearchDialog.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1336,7 +1336,7 @@ private void launchIntent(Intent intent) {
13361336
} else {
13371337
// If the intent was created from a suggestion, it will always have an explicit
13381338
// component here.
1339-
Log.i(LOG_TAG, "Starting (as ourselves) " + intent.toURI());
1339+
Log.i(LOG_TAG, "Starting (as ourselves) " + intent.toUri(0));
13401340
getContext().startActivity(intent);
13411341
// If the search switches to a different activity,
13421342
// SearchDialogWrapper#performActivityResuming
@@ -1418,7 +1418,7 @@ private void startActivityInPackage(Intent intent, String packageName) {
14181418
String resultWho = null;
14191419
int requestCode = -1;
14201420
boolean onlyIfNeeded = false;
1421-
Log.i(LOG_TAG, "Starting (uid " + uid + ", " + packageName + ") " + intent.toURI());
1421+
Log.i(LOG_TAG, "Starting (uid " + uid + ", " + packageName + ") " + intent.toUri(0));
14221422
int result = ActivityManagerNative.getDefault().startActivityInPackage(
14231423
uid, intent, resolvedType, resultTo, resultWho, requestCode, onlyIfNeeded);
14241424
checkStartActivityResult(result, intent);

core/java/android/provider/Settings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3837,7 +3837,7 @@ public static Uri add(ContentResolver cr,
38373837
ContentValues values = new ContentValues();
38383838
if (title != null) values.put(TITLE, title);
38393839
if (folder != null) values.put(FOLDER, folder);
3840-
values.put(INTENT, intent.toURI());
3840+
values.put(INTENT, intent.toUri(0));
38413841
if (shortcut != 0) values.put(SHORTCUT, (int) shortcut);
38423842
values.put(ORDERING, ordering);
38433843
return cr.insert(CONTENT_URI, values);

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ private int loadBookmarks(SQLiteDatabase db, int startingIndex, String subPath,
637637
info = packageManager.getActivityInfo(cn, 0);
638638
intent.setComponent(cn);
639639
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
640-
values.put(Settings.Bookmarks.INTENT, intent.toURI());
640+
values.put(Settings.Bookmarks.INTENT, intent.toUri(0));
641641
values.put(Settings.Bookmarks.TITLE,
642642
info.loadLabel(packageManager).toString());
643643
values.put(Settings.Bookmarks.SHORTCUT, shortcutValue);

0 commit comments

Comments
 (0)