diff options
| author | John Reck <jreck@google.com> | 2010-11-05 10:13:05 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2010-11-09 08:45:24 -0800 |
| commit | 6eb77c79f9a88ea0e76eb07ea0412bbd2446a110 (patch) | |
| tree | 59883e037de74220a4854e92f3d969bf8e3ec4e8 /src/com/android/browser/provider/BrowserProvider2.java | |
| parent | 46751ba643ce5fc69460283b8d3140ecf9530cf0 (diff) | |
| download | packages_apps_Browser-6eb77c79f9a88ea0e76eb07ea0412bbd2446a110.zip packages_apps_Browser-6eb77c79f9a88ea0e76eb07ea0412bbd2446a110.tar.gz packages_apps_Browser-6eb77c79f9a88ea0e76eb07ea0412bbd2446a110.tar.bz2 | |
Adds support for Chrome Sync to bookmark widget
Bug: 3167815
This change adds support to the bookmark widget for Chrome Sync
bookmarks.
Change-Id: I7517e639216040f93e105014ae1ef116ac8e0e06
Diffstat (limited to 'src/com/android/browser/provider/BrowserProvider2.java')
| -rw-r--r-- | src/com/android/browser/provider/BrowserProvider2.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/browser/provider/BrowserProvider2.java b/src/com/android/browser/provider/BrowserProvider2.java index 37b8eef..03f0557 100644 --- a/src/com/android/browser/provider/BrowserProvider2.java +++ b/src/com/android/browser/provider/BrowserProvider2.java @@ -584,11 +584,14 @@ public class BrowserProvider2 extends SQLiteContentProvider { qb.setTables(TABLE_BOOKMARKS_JOIN_IMAGES); String[] args; String query; + if (TextUtils.isEmpty(sortOrder)) { + sortOrder = DEFAULT_BOOKMARKS_SORT_ORDER; + } if (!useAccount) { qb.setProjectionMap(BOOKMARKS_PROJECTION_MAP); query = qb.buildQuery(projection, Bookmarks.PARENT + "=? AND " + Bookmarks.IS_DELETED + "=0", - null, null, null, DEFAULT_BOOKMARKS_SORT_ORDER, null); + null, null, null, sortOrder, null); args = new String[] { Long.toString(FIXED_ID_ROOT) }; } else { @@ -611,7 +614,7 @@ public class BrowserProvider2 extends SQLiteContentProvider { query = qb.buildUnionQuery( new String[] { bookmarksBarQuery, otherBookmarksQuery }, - DEFAULT_BOOKMARKS_SORT_ORDER, limit); + sortOrder, limit); args = new String[] { accountType, accountName, accountType, accountName, |