diff options
| author | Zhijun He <zhijunhe@google.com> | 2014-05-23 22:44:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-23 22:44:33 +0000 |
| commit | c1631fd8908c73b161797919c664edecc9d0c6c4 (patch) | |
| tree | d6085493829118cad9625595ee58fdca7b995117 /api | |
| parent | ec41d7ababd3145b7f19e5bd69480e9436cb5c7c (diff) | |
| parent | 8949225294479d6152b3bd0f56f9520e700f84b7 (diff) | |
| download | frameworks_base-c1631fd8908c73b161797919c664edecc9d0c6c4.zip frameworks_base-c1631fd8908c73b161797919c664edecc9d0c6c4.tar.gz frameworks_base-c1631fd8908c73b161797919c664edecc9d0c6c4.tar.bz2 | |
Merge "Camera2: Mark the under-specified tags for FUTURE" into lmp-preview-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index d053faa..b270698 100644 --- a/api/current.txt +++ b/api/current.txt @@ -12204,7 +12204,6 @@ package android.hardware.camera2 { field public static final android.hardware.camera2.CameraCharacteristics.Key SCALER_CROPPING_TYPE; field public static final android.hardware.camera2.CameraCharacteristics.Key SCALER_STREAM_CONFIGURATION_MAP; field public static final android.hardware.camera2.CameraCharacteristics.Key SENSOR_AVAILABLE_TEST_PATTERN_MODES; - field public static final android.hardware.camera2.CameraCharacteristics.Key SENSOR_BASE_GAIN_FACTOR; field public static final android.hardware.camera2.CameraCharacteristics.Key SENSOR_BLACK_LEVEL_PATTERN; field public static final android.hardware.camera2.CameraCharacteristics.Key SENSOR_CALIBRATION_TRANSFORM1; field public static final android.hardware.camera2.CameraCharacteristics.Key SENSOR_CALIBRATION_TRANSFORM2; @@ -12610,7 +12609,6 @@ package android.hardware.camera2 { field public static final android.hardware.camera2.CaptureResult.Key SENSOR_GREEN_SPLIT; field public static final android.hardware.camera2.CaptureResult.Key SENSOR_NEUTRAL_COLOR_POINT; field public static final android.hardware.camera2.CaptureResult.Key SENSOR_SENSITIVITY; - field public static final android.hardware.camera2.CaptureResult.Key SENSOR_TEMPERATURE; field public static final android.hardware.camera2.CaptureResult.Key SENSOR_TEST_PATTERN_DATA; field public static final android.hardware.camera2.CaptureResult.Key SENSOR_TEST_PATTERN_MODE; field public static final android.hardware.camera2.CaptureResult.Key SENSOR_TIMESTAMP; |