| commit | f40e3bfb539e26883bfc8418f5bcf19f3f622891 | [log] [tgz] |
|---|---|---|
| author | Chen Xu <fionaxu@google.com> | Thu Sep 07 23:21:10 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Sep 07 23:21:10 2017 +0000 |
| tree | 018799650acf2f7f9fd87ffb41a02981cbd6c461 | |
| parent | 6d5fbe61f8931af185f0c937a7b042679bc097a2 [diff] | |
| parent | 1f4a5f884825bd94216fde89477ec4dd45048bd5 [diff] |
Merge "Merge "Fix Crash CarrierDefaultApp due to exception" am: 0ec2348b85 am: 9d2c715d37 am: b20b5cc812" into oc-mr1-dev-plus-aosp am: 1f4a5f8848 Change-Id: Ic85ade8384be8cd27248374b8998f63025c74024
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(