diff options
| author | Jeff Brown <jeffbrown@google.com> | 2014-05-01 18:19:31 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2014-05-01 18:19:31 -0700 |
| commit | fb0448ab4b42c1b390cd75c3660ec0de511b7b3b (patch) | |
| tree | 157dff51891fa740fb36afe2c1f3e1e986dc7ec9 /packages | |
| parent | 615d1337fcb4b7e16706e615b19305eea7b689bb (diff) | |
| parent | 4f8cd18880f1a63d2db376c3bfbfe11c55e6f1ee (diff) | |
| download | frameworks_base-fb0448ab4b42c1b390cd75c3660ec0de511b7b3b.zip frameworks_base-fb0448ab4b42c1b390cd75c3660ec0de511b7b3b.tar.gz frameworks_base-fb0448ab4b42c1b390cd75c3660ec0de511b7b3b.tar.bz2 | |
resolved conflicts for merge of 4f8cd188 to master
Change-Id: I148cd616cd14d834915978aa2dc3f9e27188dbd3
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java | 6 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java | 7 |
2 files changed, 5 insertions, 8 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java index 862931e..7be4cec 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java @@ -168,9 +168,9 @@ public class KeyguardUpdateMonitorCallback { /** * Called when the screen turns off - * @param why {@link WindowManagerPolicy#OFF_BECAUSE_OF_USER}, - * {@link WindowManagerPolicy#OFF_BECAUSE_OF_TIMEOUT} or - * {@link WindowManagerPolicy#OFF_BECAUSE_OF_PROX_SENSOR}. + * @param why either {@link WindowManagerPolicy#OFF_BECAUSE_OF_ADMIN}, + * {@link WindowManagerPolicy#OFF_BECAUSE_OF_USER}, or + * {@link WindowManagerPolicy#OFF_BECAUSE_OF_TIMEOUT}. */ public void onScreenTurnedOff(int why) { } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index ffdb620..f812e8c 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -542,9 +542,8 @@ public class KeyguardViewMediator extends SystemUI { /** * Called to let us know the screen was turned off. - * @param why either {@link android.view.WindowManagerPolicy#OFF_BECAUSE_OF_USER}, - * {@link android.view.WindowManagerPolicy#OFF_BECAUSE_OF_TIMEOUT} or - * {@link android.view.WindowManagerPolicy#OFF_BECAUSE_OF_PROX_SENSOR}. + * @param why either {@link android.view.WindowManagerPolicy#OFF_BECAUSE_OF_USER} or + * {@link android.view.WindowManagerPolicy#OFF_BECAUSE_OF_TIMEOUT}. */ public void onScreenTurnedOff(int why) { synchronized (this) { @@ -576,8 +575,6 @@ public class KeyguardViewMediator extends SystemUI { } else if (why == WindowManagerPolicy.OFF_BECAUSE_OF_TIMEOUT || (why == WindowManagerPolicy.OFF_BECAUSE_OF_USER && !lockImmediately)) { doKeyguardLaterLocked(); - } else if (why == WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR) { - // Do not enable the keyguard if the prox sensor forced the screen off. } else { doKeyguardLocked(null); } |