commit 9cb7180b85596143fbaffbd933ed7e6db5240fdd
author John Reck <jreck@google.com> Fri May 13 12:45:36 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 13 12:45:36 2011 -0700
tree d8c50ad26f6214f7dcfc12920d12f3d67421872c
parent d95270ce5d17d0dae87cca3fc7a6b04161847fc7
parent ddf4a474080aa126dead6dc590caa6a7c3059eea

Merge "Prevent adding a folder to itself recursively"

src/com/android/browser/AddBookmarkPage.java

diff --git a/src/com/android/browser/AddBookmarkPage.java b/src/com/android/browser/AddBookmarkPage.java
index 18667f3..3d579a9 100644
--- a/src/com/android/browser/AddBookmarkPage.java
+++ b/src/com/android/browser/AddBookmarkPage.java
@@ -405,7 +405,7 @@
                 mCurrentFolder = info.parentId;
                 onCurrentFolderFound();
             }
-            if (info.lastUsedId != -1) {
+            if (info.lastUsedId != -1 && info.lastUsedId != info.id) {
                 if (setAccount && info.lastUsedId != mRootFolder
                         && TextUtils.equals(info.lastUsedAccountName, info.accountName)
                         && TextUtils.equals(info.lastUsedAccountType, info.accountType)) {