diff options
author | Eino-Ville Talvala <etalvala@google.com> | 2013-09-25 19:28:03 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-25 19:28:03 +0000 |
commit | 9ca833f4a5eca732b1618bc1a183215c21ae11e5 (patch) | |
tree | 86daf3d747d3d882ccdc696100014da008b20ce0 /api | |
parent | 1b87107bb37be580888f1617d047ca9009c18a7f (diff) | |
parent | 9f880f79a3f179443c8b37c3434717432b2ec8d9 (diff) | |
download | frameworks_base-9ca833f4a5eca732b1618bc1a183215c21ae11e5.zip frameworks_base-9ca833f4a5eca732b1618bc1a183215c21ae11e5.tar.gz frameworks_base-9ca833f4a5eca732b1618bc1a183215c21ae11e5.tar.bz2 |
Merge "Camera2: Add PASSIVE_UNFOCUSED autofocus state." into klp-dev
Diffstat (limited to 'api')
-rw-r--r-- | api/current.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 5e9844c..a603b77 100644 --- a/api/current.txt +++ b/api/current.txt @@ -10979,6 +10979,7 @@ package android.hardware.camera2 { field public static final int CONTROL_AF_STATE_NOT_FOCUSED_LOCKED = 5; // 0x5 field public static final int CONTROL_AF_STATE_PASSIVE_FOCUSED = 2; // 0x2 field public static final int CONTROL_AF_STATE_PASSIVE_SCAN = 1; // 0x1 + field public static final int CONTROL_AF_STATE_PASSIVE_UNFOCUSED = 6; // 0x6 field public static final int CONTROL_AF_TRIGGER_CANCEL = 2; // 0x2 field public static final int CONTROL_AF_TRIGGER_IDLE = 0; // 0x0 field public static final int CONTROL_AF_TRIGGER_START = 1; // 0x1 |