commit 0ec2348b8523aec675ddee09fe743b44a3b2ca5d
author Chen Xu <fionaxu@google.com> Thu Sep 07 20:59:03 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 07 20:59:03 2017 +0000
tree c52877fa7873a4cf2940de3785c86c1286a8cae1
parent 88307143e0bd41d95628980f528a64c718ab1b15
parent fd11ce5fafeb599822f6a0b6a4071a8cf6ccc01a

Merge "Fix Crash CarrierDefaultApp due to exception"

packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java

diff --git a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java
index ae8fc80..c79c018 100644
--- a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java
+++ b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java
@@ -170,7 +170,8 @@
     }
 
     private void done(boolean success) {
-        if (DBG) logd(String.format("Result success %b for %s", success, mUrl.toString()));
+        if (DBG) logd(String.format("Result success %b for %s", success,
+                mUrl != null ? mUrl.toString() : "null"));
         if (success) {
             // Trigger re-evaluation upon success http response code
             CarrierActionUtils.applyCarrierAction(