diff options
author | Ruben Brunk <rubenbrunk@google.com> | 2014-11-15 01:13:51 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-15 01:13:54 +0000 |
commit | 4d2d97763f0963d7011d04290dc87b2940aefb33 (patch) | |
tree | 69e72aa9e59321c0477b1ca52c2d90d9a604d6bf /api/current.txt | |
parent | 7658f0edefab392b2af13b6558d08385c9b3ed5a (diff) | |
parent | 0c22e6919ab56e85f02b3255493d0009d711a807 (diff) | |
download | frameworks_base-4d2d97763f0963d7011d04290dc87b2940aefb33.zip frameworks_base-4d2d97763f0963d7011d04290dc87b2940aefb33.tar.gz frameworks_base-4d2d97763f0963d7011d04290dc87b2940aefb33.tar.bz2 |
Merge "camera2: Add READ_SETTINGS capability." into lmp-mr1-dev
Diffstat (limited to 'api/current.txt')
-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 cc5adb2..e812a8a 100644 --- a/api/current.txt +++ b/api/current.txt @@ -12824,6 +12824,7 @@ package android.hardware.camera2 { field public static final int REQUEST_AVAILABLE_CAPABILITIES_MANUAL_POST_PROCESSING = 2; // 0x2 field public static final int REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR = 1; // 0x1 field public static final int REQUEST_AVAILABLE_CAPABILITIES_RAW = 3; // 0x3 + field public static final int REQUEST_AVAILABLE_CAPABILITIES_READ_SENSOR_SETTINGS = 5; // 0x5 field public static final int SCALER_CROPPING_TYPE_CENTER_ONLY = 0; // 0x0 field public static final int SCALER_CROPPING_TYPE_FREEFORM = 1; // 0x1 field public static final int SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_BGGR = 3; // 0x3 |