summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lucas Dupin <dupin@google.com> 2019-03-14 10:20:26 -0700
committer Lucas Dupin <dupin@google.com> 2019-03-14 10:20:26 -0700
commit5e628ae75dfc312b379acaf49c653c1fd2dfef57 (patch)
tree5a47e6b64bd62a324ae46588310186548463753d
parentc7f498fe0bceca283c384ac303422fd8e9d0eccf (diff)
Fix issue where wrong icon would be shown
Fixes: 128395347 Test: manual Change-Id: I5233121a9210f337944affb1784c7c91ec2c6a0b
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java
index b7d1fc697f2a..df3a66b18381 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java
@@ -236,7 +236,7 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange
return com.android.internal.R.anim.lock_lock;
} else if (newState == STATE_SCANNING_FACE) {
return com.android.internal.R.anim.lock_scanning;
- } else if (!wasPulsing && pulsing) {
+ } else if (!wasPulsing && pulsing && newState != STATE_LOCK_OPEN) {
return com.android.internal.R.anim.lock_in;
}
return -1;