summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorChien-Yu Chen <cychen@google.com>2015-03-03 22:24:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-03 22:24:12 +0000
commita0e17fafa10463aa876240bf36d776335679add0 (patch)
tree76f3bdb0a40db3ca12659efc78bcdd38a4e662eb /media
parent2021ef006c1f0a93f2e53e5c48c60a65de65300e (diff)
parentafa91399fd32ede17d440ec1c3321eee0426123c (diff)
downloadframeworks_base-a0e17fafa10463aa876240bf36d776335679add0.zip
frameworks_base-a0e17fafa10463aa876240bf36d776335679add0.tar.gz
frameworks_base-a0e17fafa10463aa876240bf36d776335679add0.tar.bz2
Merge "CameraManager: implement flashlight controls"
Diffstat (limited to 'media')
-rw-r--r--media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraBinderTest.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraBinderTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraBinderTest.java
index cc50c43..362bbc4 100644
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraBinderTest.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraBinderTest.java
@@ -316,6 +316,11 @@ public class CameraBinderTest extends AndroidTestCase {
throws RemoteException {
Log.v(TAG, String.format("Camera %d has status changed to 0x%x", cameraId, status));
}
+ public void onTorchStatusChanged(int status, String cameraId)
+ throws RemoteException {
+ Log.v(TAG, String.format("Camera %s has torch status changed to 0x%x",
+ cameraId, status));
+ }
}
/**