diff options
| author | John Reck <jreck@google.com> | 2011-07-28 12:45:29 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-28 12:45:29 -0700 |
| commit | 4e310c9873aa84ba4888327f88ac065d51874071 (patch) | |
| tree | 41dae61290036d7672bd8272efa1d61e1dadc98d /src/com/android/browser/provider | |
| parent | d92922c4011b22f82ca0f69437169cf4599c51e3 (diff) | |
| parent | ad662f04ed7fbd9ce464fed54fd7764290e800e8 (diff) | |
| download | packages_apps_Browser-4e310c9873aa84ba4888327f88ac065d51874071.zip packages_apps_Browser-4e310c9873aa84ba4888327f88ac065d51874071.tar.gz packages_apps_Browser-4e310c9873aa84ba4888327f88ac065d51874071.tar.bz2 | |
Merge "Tests for BP1->BP2 upgrade"
Diffstat (limited to 'src/com/android/browser/provider')
| -rw-r--r-- | src/com/android/browser/provider/BrowserProvider2.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/browser/provider/BrowserProvider2.java b/src/com/android/browser/provider/BrowserProvider2.java index 1328040..36064a5 100644 --- a/src/com/android/browser/provider/BrowserProvider2.java +++ b/src/com/android/browser/provider/BrowserProvider2.java @@ -471,6 +471,7 @@ public class BrowserProvider2 extends SQLiteContentProvider { BookmarkColumns.TITLE, // 1 BookmarkColumns.FAVICON, // 2 BookmarkColumns.TOUCH_ICON, // 3 + BookmarkColumns.CREATED, // 4 }, BookmarkColumns.BOOKMARK + "!=0", null, null, null, null); if (c != null) { @@ -478,6 +479,7 @@ public class BrowserProvider2 extends SQLiteContentProvider { ContentValues values = new ContentValues(); values.put(Bookmarks.URL, c.getString(0)); values.put(Bookmarks.TITLE, c.getString(1)); + values.put(Bookmarks.DATE_CREATED, c.getInt(4)); values.put(Bookmarks.POSITION, 0); values.put(Bookmarks.PARENT, FIXED_ID_ROOT); ContentValues imageValues = new ContentValues(); @@ -497,7 +499,9 @@ public class BrowserProvider2 extends SQLiteContentProvider { BookmarkColumns.VISITS, // 2 BookmarkColumns.DATE, // 3 BookmarkColumns.CREATED, // 4 - }, null, null, null, null, null); + }, BookmarkColumns.VISITS + " > 0 OR " + + BookmarkColumns.BOOKMARK + " = 0", + null, null, null, null); if (c != null) { while (c.moveToNext()) { ContentValues values = new ContentValues(); |