commit 4282470d84ea3f8889580408f582e8e889863164
author Chen Xu <fionaxu@google.com> Thu Sep 07 21:48:20 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 07 21:48:20 2017 +0000
tree a2999fabc584109d163934a293d9e29fc13087f6
parent a4fab98d938d76a21de9da42f225c80f86a37db0
parent b20b5cc8120fa76b09716fc9c00353d554aa7fa8

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

Change-Id: Ifb7fa6ccf70b0835c52716577a2f335e30c02b9a

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 a61881f..95ec83d 100644
--- a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java
+++ b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java
@@ -181,7 +181,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(