Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jim Miller
2011-11-17 18:58:20 -08:00
committed by Android (Google) Code Review
parent 3af8b69983 9a3caf39e4
commit 70bded0ab8
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
View File

@@ -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();
}

3
policy/src/com/android/internal/policy/impl/SimPukUnlockScreen.java
View File

@@ -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;
}

1
policy/src/com/android/internal/policy/impl/SimUnlockScreen.java
View File

@@ -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;
}