commit 9d2c715d37dcf3464b60d9bbed0deb35efeee7f0
author Chen Xu <fionaxu@google.com> Thu Sep 07 21:09:54 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 07 21:09:54 2017 +0000
tree 94160df0c1915e0b4543e7634d0be916b3130276
parent c0aea2f563d4538197a7735fef5f9287d52a6de5
parent 0ec2348b8523aec675ddee09fe743b44a3b2ca5d

Merge "Fix Crash CarrierDefaultApp due to exception"
am: 0ec2348b85

Change-Id: I04f22351f158fb6db7ba62f680b8730fd8324f1f

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 b0052cc..8553bcf 100644
--- a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java
+++ b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java
@@ -180,7 +180,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(