summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-03-02 14:19:46 -0800
committerJohn Reck <jreck@google.com>2011-03-02 14:19:46 -0800
commit0b516ceb4ddf021c5ff044f05962190d0188979b (patch)
treeb30be6abfb5a891ba8a2efeef87a41149c893ef2
parentbc5cc75c302eb49d15258155fc6f672fcbd62842 (diff)
downloadpackages_apps_Browser-0b516ceb4ddf021c5ff044f05962190d0188979b.tar.gz
packages_apps_Browser-0b516ceb4ddf021c5ff044f05962190d0188979b.tar.bz2
packages_apps_Browser-0b516ceb4ddf021c5ff044f05962190d0188979b.zip
Only import bookmarks not associated with an account
Bug: 3501936 Change-Id: I3cd98d5e18d6085db1440655e4d90d65646c29b3
-rw-r--r--src/com/android/browser/preferences/GeneralPreferencesFragment.java3
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 1c82e1c1f..9c763e98a 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());