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

Commit 3977df03 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Don't launch ConfirmDeviceCredentials multiple times." into mnc-dev

parents 1992d5a1 0c6e18f2

src/com/android/settings/ConfirmDeviceCredentialActivity.java

+9 −6
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ public class ConfirmDeviceCredentialActivity extends Activity { 
        String title = intent.getStringExtra(KeyguardManager.EXTRA_TITLE);

        String details = intent.getStringExtra(KeyguardManager.EXTRA_DESCRIPTION);



        // Ignore rotates and ensure we only launch this once

        if (savedInstanceState == null) {

            ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(this);

            if (!helper.launchConfirmationActivity(0 /* request code */, null /* title */, title,

                    details, false /* returnCredentials */, true /* isExternal */)) {
@@ -66,6 +68,7 @@ public class ConfirmDeviceCredentialActivity extends Activity { 
                finish();

            }

        }

    }



    @Override

    protected void onActivityResult(int requestCode, int resultCode, Intent data) {