summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-09-01 18:38:51 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-09-01 18:38:51 +0000
commitc69a03ca113ef4448c77f7243a899cac31276dc5 (patch)
tree55532421d3772aa05711a3185322bc0984e7d802
parent28ec011c86c8ab3294cab65ddc4d212b253a4434 (diff)
parentdf8a8998e0c81a7180b0a085b7aad845167392cb (diff)
downloadbase-c69a03ca113ef4448c77f7243a899cac31276dc5.tar.gz
Merge cherrypicks of [2837169, 2837170, 2837226, 2837188, 2836859] into oc-dr2-release
Change-Id: I6c462113f27a5295b6b6c6933272f9045ea38432
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockMethodCache.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockMethodCache.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockMethodCache.java
index 7e92edf76b74..1411a544c346 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockMethodCache.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockMethodCache.java
@@ -154,6 +154,11 @@ public class UnlockMethodCache {
public void onStrongAuthStateChanged(int userId) {
update(false /* updateAlways */);
}
+
+ @Override
+ public void onScreenTurnedOff() {
+ update(false /* updateAlways */);
+ }
};
public boolean isTrustManaged() {