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

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

merge from open-source master 

Change-Id: I405069e9495e43fdcdedc41efce77d43a291272c
parents fa804aa3 e6af73e1

core/java/android/app/ApplicationContext.java

0 → 100644
+2781 −0

File added.

Preview size limit exceeded, changes collapsed.

core/java/android/app/SearchDialog.java

+1 −1
Original line number Diff line number Diff line
@@ -1131,7 +1131,7 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS 
        try {

            // 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

core/java/android/provider/Settings.java

+1 −1
Original line number Diff line number Diff line
@@ -3577,7 +3577,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);