summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorRachad Alao <rachad@google.com>2013-09-13 23:44:43 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-13 23:44:44 +0000
commit4fe6429ba2c77a2cc639d712ba979e1f538c5bb1 (patch)
tree0632e40a487b8c20ba3095b26fd8e2e5daf0701f /api
parent12c7a0c970dfa56391f1e7f7a8ed41348acb14c4 (diff)
parentbbae94a02e73020646535b0d915f4557c39f357b (diff)
downloadframeworks_base-4fe6429ba2c77a2cc639d712ba979e1f538c5bb1.zip
frameworks_base-4fe6429ba2c77a2cc639d712ba979e1f538c5bb1.tar.gz
frameworks_base-4fe6429ba2c77a2cc639d712ba979e1f538c5bb1.tar.bz2
Merge "Camera2: Rename TEMPLATE_MANUAL to TEMPLATE_ZERO_SHUTTER_LAG" into klp-dev
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index 57384a7..fab32e8 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -10822,7 +10822,6 @@ package android.hardware.camera2 {
method public abstract void setRepeatingRequest(android.hardware.camera2.CaptureRequest, android.hardware.camera2.CameraDevice.CaptureListener, android.os.Handler) throws android.hardware.camera2.CameraAccessException;
method public abstract void stopRepeating() throws android.hardware.camera2.CameraAccessException;
method public abstract void waitUntilIdle() throws android.hardware.camera2.CameraAccessException;
- field public static final int TEMPLATE_MANUAL = 5; // 0x5
field public static final int TEMPLATE_PREVIEW = 1; // 0x1
field public static final int TEMPLATE_RECORD = 3; // 0x3
field public static final int TEMPLATE_STILL_CAPTURE = 2; // 0x2