diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-03-10 16:59:51 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-03-10 16:59:51 +0000 |
| commit | 78692bfeeddeb9218cd24940ba6f828f86ee26a2 (patch) | |
| tree | 0fc13fd92643f45f47367ee042360cbfee28b309 /camera2/portability/src/com/android/ex/camera2/portability/CameraActions.java | |
| parent | 9bd171c5eeb3c94cd0c50f3ec6906d706eee7fe8 (diff) | |
| parent | 02ce5a07e060328c367326770f5451e945633aff (diff) | |
| download | android_frameworks_ex-stable/cm-12.1-YOG4P.tar.gz android_frameworks_ex-stable/cm-12.1-YOG4P.tar.bz2 android_frameworks_ex-stable/cm-12.1-YOG4P.zip | |
Merge tag 'android-5.1.0_r1' into HEADstaging/cm-12.1stable/cm-12.1-YOG7Dstable/cm-12.1-YOG4Pstable/cm-12.1-YOG3Ccm-12.1
Android 5.1.0 release 1
Change-Id: I11a3d0ee668ab4fd9ad7f07decbdf99c57024291
Diffstat (limited to 'camera2/portability/src/com/android/ex/camera2/portability/CameraActions.java')
| -rw-r--r-- | camera2/portability/src/com/android/ex/camera2/portability/CameraActions.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/CameraActions.java b/camera2/portability/src/com/android/ex/camera2/portability/CameraActions.java index 407fbb1..63b1fec 100644 --- a/camera2/portability/src/com/android/ex/camera2/portability/CameraActions.java +++ b/camera2/portability/src/com/android/ex/camera2/portability/CameraActions.java @@ -47,7 +47,6 @@ class CameraActions { public static final int SET_FACE_DETECTION_LISTENER = 461; public static final int START_FACE_DETECTION = 462; public static final int STOP_FACE_DETECTION = 463; - public static final int SET_ERROR_CALLBACK = 464; // Presentation public static final int ENABLE_SHUTTER_SOUND = 501; public static final int SET_DISPLAY_ORIENTATION = 502; @@ -107,8 +106,6 @@ class CameraActions { return "START_FACE_DETECTION"; case STOP_FACE_DETECTION: return "STOP_FACE_DETECTION"; - case SET_ERROR_CALLBACK: - return "SET_ERROR_CALLBACK"; case ENABLE_SHUTTER_SOUND: return "ENABLE_SHUTTER_SOUND"; case SET_DISPLAY_ORIENTATION: |