diff options
| author | John Reck <jreck@google.com> | 2011-05-13 12:45:36 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-13 12:45:36 -0700 |
| commit | 9cb7180b85596143fbaffbd933ed7e6db5240fdd (patch) | |
| tree | d8c50ad26f6214f7dcfc12920d12f3d67421872c /src/com/android/browser | |
| parent | d95270ce5d17d0dae87cca3fc7a6b04161847fc7 (diff) | |
| parent | ddf4a474080aa126dead6dc590caa6a7c3059eea (diff) | |
| download | packages_apps_Browser-9cb7180b85596143fbaffbd933ed7e6db5240fdd.zip packages_apps_Browser-9cb7180b85596143fbaffbd933ed7e6db5240fdd.tar.gz packages_apps_Browser-9cb7180b85596143fbaffbd933ed7e6db5240fdd.tar.bz2 | |
Merge "Prevent adding a folder to itself recursively"
Diffstat (limited to 'src/com/android/browser')
| -rw-r--r-- | src/com/android/browser/AddBookmarkPage.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ public class AddBookmarkPage extends Activity 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)) { |