Fix Crash CarrierDefaultApp due to exception

[Issue]
CarrierDefaultApp crashes due to null pointer exception.

[Cause of defect]
To call mUrl.toString() even if mUrl is null and mUrl is already
checked if it is null just before.

[How to fix]
Check the null status of mUrl when call its toString() method.

Bug: 65393337

Change-Id: I4b4b1f125aac7e30ca18be22d7adc358cab83b2f

diff --git a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java
index c1f03fd..fbed837 100644 (file)
--- a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java
+++ b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java
@@ -170,7 +170,8 @@ public class CaptivePortalLoginActivity extends Activity {
     }
 
     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(