diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-07-21 21:53:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-21 21:53:11 +0000 |
| commit | c1244a2995087c930842b7d5e5a35a446c5c40f7 (patch) | |
| tree | c87fdaca3274a17e3c2231ec21ddcbb3c8e4ef75 /packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java | |
| parent | cf051d1846c347413d8c907b42f3fce74795a815 (diff) | |
| parent | 740452e8756cb7f51ed185c3906a5ca61b8fcdd4 (diff) | |
| download | frameworks_base-c1244a2995087c930842b7d5e5a35a446c5c40f7.zip frameworks_base-c1244a2995087c930842b7d5e5a35a446c5c40f7.tar.gz frameworks_base-c1244a2995087c930842b7d5e5a35a446c5c40f7.tar.bz2 | |
Merge "Touch, wake and unlock" into mnc-dev
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java index 98558b4..9f21dbe 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java @@ -25,9 +25,9 @@ import android.os.IBinder; import android.os.Process; import android.util.Log; +import com.android.internal.policy.IKeyguardDrawnCallback; import com.android.internal.policy.IKeyguardExitCallback; import com.android.internal.policy.IKeyguardService; -import com.android.internal.policy.IKeyguardShowCallback; import com.android.internal.policy.IKeyguardStateCallback; import com.android.systemui.SystemUIApplication; @@ -120,9 +120,15 @@ public class KeyguardService extends Service { } @Override // Binder interface - public void onStartedWakingUp(IKeyguardShowCallback callback) { + public void onStartedWakingUp() { checkPermission(); - mKeyguardViewMediator.onStartedWakingUp(callback); + mKeyguardViewMediator.onStartedWakingUp(); + } + + @Override // Binder interface + public void onScreenTurningOn(IKeyguardDrawnCallback callback) { + checkPermission(); + mKeyguardViewMediator.onScreenTurningOn(callback); } @Override // Binder interface |