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

Commit e6af73e1 authored by Christian Mehlmauer's avatar Christian Mehlmauer Committed by Jean-Baptiste Queru
Browse files

Replaced deprecated Inten.toURI method 

Change-Id: Iff3200294edbc1cac188502219bfe481133a5d8e
parent baccb91e

core/java/android/app/ApplicationContext.java

+1 −1
Original line number Diff line number Diff line
@@ -1972,7 +1972,7 @@ class ApplicationContext extends Context { 
                return info.activityInfo.loadIcon(this);

            }



            throw new NameNotFoundException(intent.toURI());

            throw new NameNotFoundException(intent.toUri(0));

        }



        @Override public Drawable getDefaultActivityIcon() {

core/java/android/app/SearchDialog.java

+2 −2
Original line number Diff line number Diff line
@@ -1336,7 +1336,7 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS 
            } else {

                // If the intent was created from a suggestion, it will always have an explicit

                // component here.

                Log.i(LOG_TAG, "Starting (as ourselves) " + intent.toURI());

                Log.i(LOG_TAG, "Starting (as ourselves) " + intent.toUri(0));

                getContext().startActivity(intent);

                // If the search switches to a different activity,

                // SearchDialogWrapper#performActivityResuming
@@ -1418,7 +1418,7 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS 
            String resultWho = null;

            int requestCode = -1;

            boolean onlyIfNeeded = false;

            Log.i(LOG_TAG, "Starting (uid " + uid + ", " + packageName + ") " + intent.toURI());

            Log.i(LOG_TAG, "Starting (uid " + uid + ", " + packageName + ") " + intent.toUri(0));

            int result = ActivityManagerNative.getDefault().startActivityInPackage(

                    uid, intent, resolvedType, resultTo, resultWho, requestCode, onlyIfNeeded);

            checkStartActivityResult(result, intent);

core/java/android/provider/Settings.java

+1 −1
Original line number Diff line number Diff line
@@ -3837,7 +3837,7 @@ public final class Settings { 
            ContentValues values = new ContentValues();

            if (title != null) values.put(TITLE, title);

            if (folder != null) values.put(FOLDER, folder);

            values.put(INTENT, intent.toURI());

            values.put(INTENT, intent.toUri(0));

            if (shortcut != 0) values.put(SHORTCUT, (int) shortcut);

            values.put(ORDERING, ordering);

            return cr.insert(CONTENT_URI, values);

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

+1 −1
Original line number Diff line number Diff line
@@ -637,7 +637,7 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
                    info = packageManager.getActivityInfo(cn, 0);

                    intent.setComponent(cn);

                    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

                    values.put(Settings.Bookmarks.INTENT, intent.toURI());

                    values.put(Settings.Bookmarks.INTENT, intent.toUri(0));

                    values.put(Settings.Bookmarks.TITLE,

                            info.loadLabel(packageManager).toString());

                    values.put(Settings.Bookmarks.SHORTCUT, shortcutValue);