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

Not all WebView's host have permission to read the history.

Browse Source 
Add a security catch and return an empty list.

We don't use tab in the code.

Fix http://b/viewIssue?id=2144339
This commit is contained in:
Grace Kloba
2009-09-24 14:14:11 -07:00
committed by android-build SharedAccount
parent 8c2623e997
commit bf54f02b59
2 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/provider/Browser.java
View File

@@ -281,11 +281,11 @@ public class Browser {
*/ */
public static final String[] getVisitedHistory(ContentResolver cr) { public static final String[] getVisitedHistory(ContentResolver cr) {
try { try {
String[] projection = new String[] { "url" }; String[] projection = new String[] {
Cursor c = cr.query(BOOKMARKS_URI, "url"
projection, };
"visits > 0", Cursor c = cr.query(BOOKMARKS_URI, projection, "visits > 0", null,
null, null); null);
String[] str = new String[c.getCount()]; String[] str = new String[c.getCount()];
int i = 0; int i = 0;
while (c.moveToNext()) { while (c.moveToNext()) {

4
core/java/android/webkit/WebViewCore.java
View File

@@ -312,7 +312,9 @@ final class WebViewCore {
} }
protected String[] populateVisitedLinks() { protected String[] populateVisitedLinks() {
return Browser.getVisitedHistory(mContext.getContentResolver()); // FIXME: getVisitedHistory needs permission and host may not have.
// return Browser.getVisitedHistory(mContext.getContentResolver());
return new String[0];
} }
/** /**