commit 0b516ceb4ddf021c5ff044f05962190d0188979b
author John Reck <jreck@google.com> Wed Mar 02 14:19:46 2011 -0800
committer John Reck <jreck@google.com> Wed Mar 02 14:19:46 2011 -0800
tree b30be6abfb5a891ba8a2efeef87a41149c893ef2
parent bc5cc75c302eb49d15258155fc6f672fcbd62842

Only import bookmarks not associated with an account

 Bug: 3501936

Change-Id: I3cd98d5e18d6085db1440655e4d90d65646c29b3

src/com/android/browser/preferences/GeneralPreferencesFragment.java

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 @@
                     // 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());