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

Commit ba5c4121 authored by John Reck's avatar John Reck
Browse files

Fix testGetAllVisitedUrls to match BP1 behavior 

 Bug: 3306953
 Previously with BrowserProvider1 all bookmarks were considered
 visited URLs. Updated Browser.getAllVisitedUrls to match that behavior
 when using BrowserProvider2

Change-Id: I15e6e4e91af4e7d1b21860aabf4ce5a5c6a9d81e
parent a97ec8dc

core/java/android/provider/Browser.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ import android.database.DatabaseUtils; 
import android.graphics.BitmapFactory;

import android.graphics.BitmapFactory;

import android.net.Uri;

import android.net.Uri;

import android.provider.BrowserContract.Bookmarks;

import android.provider.BrowserContract.Bookmarks;

import android.provider.BrowserContract.Combined;

import android.provider.BrowserContract.History;

import android.provider.BrowserContract.History;

import android.provider.BrowserContract.Searches;

import android.provider.BrowserContract.Searches;

import android.util.Log;

import android.util.Log;
@@ -244,8 +245,9 @@ public class Browser { 
     */

     */

    public static final Cursor getAllVisitedUrls(ContentResolver cr) throws

    public static final Cursor getAllVisitedUrls(ContentResolver cr) throws

            IllegalStateException {

            IllegalStateException {

        return cr.query(History.CONTENT_URI,

        return cr.query(Combined.CONTENT_URI,

                new String[] { History.URL }, null, null, null);

                new String[] { Combined.URL }, null, null,

                Combined.DATE_CREATED + " ASC");

    }

    }





    private static final void addOrUrlEquals(StringBuilder sb) {

    private static final void addOrUrlEquals(StringBuilder sb) {