drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Report keyguard as initially showing and secure until we know" into klp-dev

Browse Source
This commit is contained in:
Jim Miller
2013-11-14 01:45:51 +00:00
committed by Android (Google) Code Review
parent c32d89f63f e5f17ab5a6
commit c8867b2807
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java
View File

@ -200,7 +200,7 @@ public class KeyguardViewMediator {
// cached value of whether we are showing (need to know this to quickly
// answer whether the input should be restricted)
private boolean mShowing = false;
private boolean mShowing;
// true if the keyguard is hidden by another window
private boolean mHidden = false;
@ -508,6 +508,9 @@ public class KeyguardViewMediator {
? lockPatternUtils : new LockPatternUtils(mContext);
mLockPatternUtils.setCurrentUser(UserHandle.USER_OWNER);
// Assume keyguard is showing (unless it's disabled) until we know for sure...
mShowing = !mLockPatternUtils.isLockScreenDisabled();
WindowManager wm = (WindowManager)context.getSystemService(Context.WINDOW_SERVICE);
mKeyguardViewManager = new KeyguardViewManager(context, wm, mViewMediatorCallback,

8
policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceDelegate.java
View File

@ -40,6 +40,14 @@ public class KeyguardServiceDelegate {
private KeyguardState mKeyguardState = new KeyguardState();
/* package */ static final class KeyguardState {
KeyguardState() {
// Assume keyguard is showing and secure until we know for sure. This is here in
// the event something checks before the service is actually started.
// KeyguardService itself should default to this state until the real state is known.
showing = true;
showingAndNotHidden = true;
secure = true;
}
boolean showing;
boolean showingAndNotHidden;
boolean inputRestricted;