diff options
author | Adrian Roos <roosa@google.com> | 2015-04-16 12:23:18 -0700 |
---|---|---|
committer | Adrian Roos <roosa@google.com> | 2015-04-17 01:12:30 +0000 |
commit | 94e15a59b757678949cccb5d783bee1638e84697 (patch) | |
tree | 1f69ef1533739cba105578e95d03934c1ee87261 /packages/SystemUI | |
parent | fbad74b29cdaf955f48024123bd198fa7c49662c (diff) | |
download | frameworks_base-94e15a59b757678949cccb5d783bee1638e84697.zip frameworks_base-94e15a59b757678949cccb5d783bee1638e84697.tar.gz frameworks_base-94e15a59b757678949cccb5d783bee1638e84697.tar.bz2 |
Allow dismissing Keyguard from TrustAgentService
Bug: 19900313
Change-Id: I44d13ee6fe65070327076e73a3ed96c94acdc108
Diffstat (limited to 'packages/SystemUI')
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 97a4c55..f16fb5c 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -505,6 +505,11 @@ public class KeyguardViewMediator extends SystemUI { public boolean isInputRestricted() { return KeyguardViewMediator.this.isInputRestricted(); } + + @Override + public boolean isScreenOn() { + return mScreenOn; + } }; public void userActivity() { |