diff options
| author | Chen Xu <fionaxu@google.com> | 2017-09-07 20:59:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-09-07 20:59:03 +0000 |
| commit | 0ec2348b8523aec675ddee09fe743b44a3b2ca5d (patch) | |
| tree | c52877fa7873a4cf2940de3785c86c1286a8cae1 | |
| parent | 88307143e0bd41d95628980f528a64c718ab1b15 (diff) | |
| parent | fd11ce5fafeb599822f6a0b6a4071a8cf6ccc01a (diff) | |
| download | base-0ec2348b8523aec675ddee09fe743b44a3b2ca5d.tar.gz | |
Merge "Fix Crash CarrierDefaultApp due to exception"android-o-mr1-preview-2android-o-mr1-preview-1
| -rw-r--r-- | packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java index ae8fc80f03c7..c79c018d34a6 100644 --- 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( |