Merge "Fix issue where wrong icon would be shown" (67244aea) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;