Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 6c9a3004 to master

Browse Source 
Change-Id: Ia1a8a2015c087004d3dfc64681dbe0315558dc95
This commit is contained in:
Jean-Baptiste Queru
2010-06-21 11:44:49 -07:00
parent 9a76eb568d 6c9a30045b
commit a6fa26f83f
11 changed files with 21 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/SearchDialog.java
View File

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

2
core/java/android/provider/Settings.java
View File

@@ -3588,7 +3588,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);