commit 897b8838bb59fa89226a4b72e27571eefe43ca60
author John Reck <jreck@google.com> Thu Nov 10 15:44:37 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 10 15:44:37 2011 -0800
tree 2c9e6b7addf83855396c4a143fe9619380e6c985
parent 4409358ac603ec61f42a1b40f90d8b2893d9ad0b
parent 93384ff95133b2ee0acae696c7ce050f28c0dd86

Merge "Handle error condition when inserting snapshots" into ics-mr1

src/com/android/browser/AddBookmarkPage.java

diff --git a/src/com/android/browser/AddBookmarkPage.java b/src/com/android/browser/AddBookmarkPage.java
index ae5ae69..fdb34c4 100644
--- a/src/com/android/browser/AddBookmarkPage.java
+++ b/src/com/android/browser/AddBookmarkPage.java
@@ -145,6 +145,13 @@
     }
 
     private Uri getUriForFolder(long folder) {
+        BookmarkAccount account =
+                (BookmarkAccount) mAccountSpinner.getSelectedItem();
+        if (folder == mRootFolder && account != null) {
+            return BookmarksLoader.addAccount(
+                    BrowserContract.Bookmarks.CONTENT_URI_DEFAULT_FOLDER,
+                    account.accountType, account.accountName);
+        }
         return BrowserContract.Bookmarks.buildFolderUri(folder);
     }
 
@@ -437,8 +444,8 @@
             BookmarkAccount account = mAccountAdapter.getItem(i);
             if (TextUtils.equals(account.accountName, accountName)
                     && TextUtils.equals(account.accountType, accountType)) {
-                onRootFolderFound(account.rootFolderId);
                 mAccountSpinner.setSelection(i);
+                onRootFolderFound(account.rootFolderId);
                 return;
             }
         }