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

Commit 1a783be3 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am 70bded0a: Merge "Fix 5636798: clear PIN/PUK fields when device sleeps or... 

am 70bded0a: Merge "Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels" into ics-mr1

* commit '70bded0a':
  Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels
parents 1753fd00 70bded0a

policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java

+9 −4
Original line number Diff line number Diff line
@@ -558,9 +558,12 @@ public class LockPatternKeyguardView extends KeyguardViewBase implements Handler 
        mScreenOn = false;

        mForgotPattern = false;

        mHasOverlay = mUpdateMonitor.getPhoneState() != TelephonyManager.CALL_STATE_IDLE;

        if (mMode == Mode.LockScreen) {



        // Emulate activity life-cycle for both lock and unlock screen.

        if (mLockScreen != null) {

            ((KeyguardScreen) mLockScreen).onPause();

        } else {

        }

        if (mUnlockScreen != null) {

            ((KeyguardScreen) mUnlockScreen).onPause();

        }
@@ -651,9 +654,11 @@ public class LockPatternKeyguardView extends KeyguardViewBase implements Handler 


    @Override

    public void show() {

        if (mMode == Mode.LockScreen) {

        // Emulate activity life-cycle for both lock and unlock screen.

        if (mLockScreen != null) {

            ((KeyguardScreen) mLockScreen).onResume();

        } else {

        }

        if (mUnlockScreen != null) {

            ((KeyguardScreen) mUnlockScreen).onResume();

        }

policy/src/com/android/internal/policy/impl/SimPukUnlockScreen.java

+3 −0
Original line number Diff line number Diff line
@@ -383,6 +383,9 @@ public class SimPukUnlockScreen extends LinearLayout implements KeyguardScreen, 


        public void onClick(View v) {

            if (v == mCancelButton) {

                // clear the PIN/PUK entry fields if the user cancels

                mPinText.setText("");

                mPukText.setText("");

                mCallback.goToLockScreen();

                return;

            }

policy/src/com/android/internal/policy/impl/SimUnlockScreen.java

+1 −0
Original line number Diff line number Diff line
@@ -359,6 +359,7 @@ public class SimUnlockScreen extends LinearLayout implements KeyguardScreen, Vie 


        public void onClick(View v) {

            if (v == mCancelButton) {

                mPinText.setText(""); // clear the PIN entry field if the user cancels

                mCallback.goToLockScreen();

                return;

            }