Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f4a5f88 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix Crash CarrierDefaultApp due to exception" am: 0ec2348b am:... 

Merge "Merge "Fix Crash CarrierDefaultApp due to exception" am: 0ec2348b am: 9d2c715d am: b20b5cc8" into oc-mr1-dev-plus-aosp
parents 346388d7 4282470d

packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -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(