summaryrefslogtreecommitdiffstats
path: root/policy
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2013-09-25 15:44:15 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-25 15:44:15 -0700
commit4bf2c790b971cf43c65d8e9e5721a2a9dde474b5 (patch)
tree55616dfa5766959d76ab98dcd9bac716bcda557b /policy
parentb4d4d68795a10401e3cb50df491a2e5d5b1ac96e (diff)
parent04b0840b2e5367547fdd92f4e2c68cde16486062 (diff)
downloadframeworks_base-4bf2c790b971cf43c65d8e9e5721a2a9dde474b5.zip
frameworks_base-4bf2c790b971cf43c65d8e9e5721a2a9dde474b5.tar.gz
frameworks_base-4bf2c790b971cf43c65d8e9e5721a2a9dde474b5.tar.bz2
am 04b0840b: Merge "Accessibility improvements in keyguard - add accessibility descriptions to camera and search light - add new onClick handler to simplify launching search and camera - plumb camera launch through KeyguardService interface" into klp-dev
* commit '04b0840b2e5367547fdd92f4e2c68cde16486062': Accessibility improvements in keyguard - add accessibility descriptions to camera and search light - add new onClick handler to simplify launching search and camera - plumb camera launch through KeyguardService interface
Diffstat (limited to 'policy')
-rw-r--r--policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceWrapper.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceWrapper.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceWrapper.java
index b27584d..5e299ee 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceWrapper.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceWrapper.java
@@ -192,6 +192,10 @@ public class KeyguardServiceWrapper implements IKeyguardService {
// Not used by PhoneWindowManager. See code in {@link NavigationBarView}
}
+ public void launchCamera() {
+ // Not used by PhoneWindowManager. See code in {@link NavigationBarView}
+ }
+
@Override
public IBinder asBinder() {
return mService.asBinder();