Merge "Merge "Fix Crash CarrierDefaultApp due to exception" am: 0ec2348b85 am: 9d2c715d37 am: b20b5cc812" into oc-mr1-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2017-09-07 21:53:53 +00:00
committed by Android (Google) Code Review

View File

@@ -181,7 +181,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(