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

Commit 18e80648 authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Fix testGetAllVisitedUrls to match BP1 behavior"

parents ad9a064f ba5c4121

core/java/android/provider/Browser.java

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

import android.net.Uri;

import android.provider.BrowserContract.Bookmarks;

import android.provider.BrowserContract.Combined;

import android.provider.BrowserContract.History;

import android.provider.BrowserContract.Searches;

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

    public static final Cursor getAllVisitedUrls(ContentResolver cr) throws

            IllegalStateException {

        return cr.query(History.CONTENT_URI,

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

        return cr.query(Combined.CONTENT_URI,

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

                Combined.DATE_CREATED + " ASC");

    }



    private static final void addOrUrlEquals(StringBuilder sb) {