commit 7fe7f2943861afb6af3e4cfd312040c1a2f61341
author Axesh  R. Ajmera <aajmera@codeaurora.org> Fri Jan 09 16:02:38 2015 -0800
committer WebTech Code Review <code-review@localhost> Fri Jan 16 16:09:18 2015 -0800
tree 26933cb96306c8a2d48daf38b83059b929cd229d
parent 5b8f575d8a32f1ffa5bea9e6cb8d1812b3b5b6fa

Fix for CTS BrowserTest on Lollipop

Change-Id: I80653a67834375fd87efb0ef330912f99ca91f12

src/com/android/browser/provider/BrowserProvider2.java

diff --git a/src/com/android/browser/provider/BrowserProvider2.java b/src/com/android/browser/provider/BrowserProvider2.java
index ece565b..0a30853 100644
--- a/src/com/android/browser/provider/BrowserProvider2.java
+++ b/src/com/android/browser/provider/BrowserProvider2.java
@@ -1106,6 +1106,12 @@
                 if ((match == LEGACY || match == LEGACY_ID)
                         && projection == null) {
                     projection = Browser.HISTORY_PROJECTION;
+                    /* do not allow the id with val =1
+                     * since all the columns at id 1 are null
+                     * and do not represent any information to the user
+                     */
+                    selection = DatabaseUtils.concatenateWhere(
+                        selection,  "_id > 1");
                 }
                 String[] args = createCombinedQuery(uri, projection, qb);
                 if (selectionArgs == null) {
@@ -1246,7 +1252,7 @@
             boolean callerIsSyncAdapter) {
         //TODO cascade deletes down from folders
         final SQLiteDatabase db = mOpenHelper.getWritableDatabase();
-        if (callerIsSyncAdapter) {
+       if (callerIsSyncAdapter || android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.KITKAT) {
             return db.delete(TABLE_BOOKMARKS, selection, selectionArgs);
         }
         ContentValues values = new ContentValues();