diff options
| author | John Reck <jreck@google.com> | 2011-03-02 17:14:35 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-02 17:14:35 -0800 |
| commit | 0803e101ec185564b76874af0148e99de41ff9db (patch) | |
| tree | 76159cff2df05de873e2292b2cb3e97850e8f699 | |
| parent | af6373939c201cc62f273182a67252fbc4e50840 (diff) | |
| parent | 0b516ceb4ddf021c5ff044f05962190d0188979b (diff) | |
| download | packages_apps_Browser-0803e101ec185564b76874af0148e99de41ff9db.zip packages_apps_Browser-0803e101ec185564b76874af0148e99de41ff9db.tar.gz packages_apps_Browser-0803e101ec185564b76874af0148e99de41ff9db.tar.bz2 | |
Merge "Only import bookmarks not associated with an account"
| -rw-r--r-- | src/com/android/browser/preferences/GeneralPreferencesFragment.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/browser/preferences/GeneralPreferencesFragment.java b/src/com/android/browser/preferences/GeneralPreferencesFragment.java index 1c82e1c..9c763e9 100644 --- a/src/com/android/browser/preferences/GeneralPreferencesFragment.java +++ b/src/com/android/browser/preferences/GeneralPreferencesFragment.java @@ -426,7 +426,8 @@ public class GeneralPreferencesFragment extends PreferenceFragment // Re-parent the existing bookmarks to the newly create bookmarks bar folder ops.add(ContentProviderOperation.newUpdate(Bookmarks.CONTENT_URI) .withValueBackReference(Bookmarks.PARENT, 2) - .withSelection(Bookmarks.PARENT + "=?", + .withSelection(Bookmarks.ACCOUNT_NAME + " IS NULL AND " + + Bookmarks.PARENT + "=?", new String[] { Integer.toString(1) }) .build()); |