diff options
| author | Jeff Brown <jeffbrown@google.com> | 2014-05-02 01:26:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-02 01:26:29 +0000 |
| commit | f347bc39fcbc9836e4914d4a610dadaa93a538d0 (patch) | |
| tree | c3cbeb2d7af9bc74d2b5fe9238cbb4f4c86ce34e /packages/Keyguard | |
| parent | 8af18df299b9d168cc4af0c5e3aaff753780e8c7 (diff) | |
| parent | 8822d4befdb30452ad4276b42d89062938b51a1f (diff) | |
| download | frameworks_base-f347bc39fcbc9836e4914d4a610dadaa93a538d0.zip frameworks_base-f347bc39fcbc9836e4914d4a610dadaa93a538d0.tar.gz frameworks_base-f347bc39fcbc9836e4914d4a610dadaa93a538d0.tar.bz2 | |
am 06dec565: Merge "resolved conflicts for merge of 4f8cd188 to master"
* commit '06dec5656d75345566fd31a2cfc6bd5c84bf41de':
Clean up some terminology related to interactive state.
Diffstat (limited to 'packages/Keyguard')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java | 6 |
1 files changed, 3 insertions, 3 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) { } |