commit 13198ac770e9d91d0035b513c8a5c0c6d9d2221c
author Vivek Sekhar <vsekhar@codeaurora.org> Fri Jan 08 14:47:21 2016 -0800
committer jrizzoli <joey@cyanogenmoditalia.it> Mon Jan 11 22:03:29 2016 +0100
tree a856ae6f06b2a382d4131b54da8b0339e1963f3e
parent d5f34f89df796fb2f4174a968a1c463f1f24478a

Guard against null strings

Change-Id: I165c9fee57c0605b95751cc5875e6e6142e2001b
CR-Fixed: SWE-6070

src/com/android/browser/TabControl.java

diff --git a/src/com/android/browser/TabControl.java b/src/com/android/browser/TabControl.java
index 00f3c44..1d647d1 100644
--- a/src/com/android/browser/TabControl.java
+++ b/src/com/android/browser/TabControl.java
@@ -18,6 +18,7 @@
 
 import android.net.Uri;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.util.Log;
 
 import org.codeaurora.swe.GeolocationPermissions;
@@ -47,9 +48,11 @@
      */
     public void findAndReload(String origin) {
         for (Tab tab : mTabs){
-            if (tab.getWebView() != null) {
-                Uri url = Uri.parse(tab.getWebView().getUrl());
-                if (url.getHost().equals(origin)){
+            WebView wv = tab.getWebView();
+            if (wv != null && !TextUtils.isEmpty(wv.getUrl())) {
+                Uri url = Uri.parse(wv.getUrl());
+                if ((url != null && url.getHost() != null) &&
+                        url.getHost().equals(origin) ) {
                     tab.getWebView().reload();
                 }
             }