commit 950f627953b2bfedecf827e3e6c020b2cbb3dcd2
author Linux Build Service Account <lnxbuild@localhost> Fri Aug 16 02:40:20 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Aug 16 02:40:20 2013 -0700
tree 1dfde98fa17ef3f8e9d31675d38520067181ecf1
parent ee930e1e18dc78726274d5540e22fef16de7ef32
parent 47097d6fbbe9a63b987ad4063c6673630e429e8f

Merge "Browser: fix open a blank tab for folder-type bookmark"

src/com/android/browser/Controller.java

diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 8e118a1..4ec5042 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -1203,8 +1203,10 @@
                             ComboViewActivity.EXTRA_OPEN_ALL);
                     Tab parent = getCurrentTab();
                     for (String url : urls) {
-                        parent = openTab(url, parent,
-                                !mSettings.openInBackground(), true);
+                        if (url != null) {
+                            parent = openTab(url, parent,
+                                    !mSettings.openInBackground(), true);
+                        }
                     }
                 } else if (intent.hasExtra(ComboViewActivity.EXTRA_OPEN_SNAPSHOT)) {
                     long id = intent.getLongExtra(