summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2015-06-04 16:31:54 -0700
committerJorim Jaggi <jjaggi@google.com>2015-06-05 18:12:34 +0000
commit853cbe38c9aa80671a2e7e616f48a6160c722eea (patch)
tree21a30fa17b13b779573bbf7ae0b9e7baced8554f /packages/SystemUI/src
parent5f185270375e55a53ddb57982827ec0ac3edcf85 (diff)
downloadframeworks_base-853cbe38c9aa80671a2e7e616f48a6160c722eea.zip
frameworks_base-853cbe38c9aa80671a2e7e616f48a6160c722eea.tar.gz
frameworks_base-853cbe38c9aa80671a2e7e616f48a6160c722eea.tar.bz2
Don't play lock sound when just resetting Keyguard
Bug: 21595440 Change-Id: I9bd470d051f4851dcde83099f1ba1f0a9bae429a
Diffstat (limited to 'packages/SystemUI/src')
-rw-r--r--packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index 0dcc0b9..86910fe 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -658,7 +658,7 @@ public class KeyguardViewMediator extends SystemUI {
mPendingLock = true;
}
- if (mPendingLock || mPendingReset) {
+ if (mPendingLock) {
playSounds(true);
}
}