diff options
| author | Emilian Peev <epeev@google.com> | 2021-10-13 22:40:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-10-13 22:40:46 +0000 |
| commit | cd056ddbb81b31ed46f7f90b81b53c6e0ee02bb1 (patch) | |
| tree | bb04afca58ae34c4380e8eca0c63049b4a7844d4 /core/api | |
| parent | 4da674b5177e6df9ea0db8d61e95957010660b9c (diff) | |
| parent | 1a1461e5ae6eb9a886cc65a26a5a8c93f47c73e0 (diff) | |
Merge "Camera: Rename DeviceStateOrientationMap" into sc-v2-dev
Diffstat (limited to 'core/api')
| -rw-r--r-- | core/api/current.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index f46c809f996c..c7d92b0cd74e 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -17949,7 +17949,7 @@ package android.hardware.camera2 { field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> EDGE_AVAILABLE_EDGE_MODES; field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Boolean> FLASH_INFO_AVAILABLE; field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> HOT_PIXEL_AVAILABLE_HOT_PIXEL_MODES; - field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.DeviceStateOrientationMap> INFO_DEVICE_STATE_ORIENTATION_MAP; + field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.DeviceStateSensorOrientationMap> INFO_DEVICE_STATE_SENSOR_ORIENTATION_MAP; field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> INFO_SUPPORTED_HARDWARE_LEVEL; field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.String> INFO_VERSION; field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Size[]> JPEG_AVAILABLE_THUMBNAIL_SIZES; @@ -18644,7 +18644,7 @@ package android.hardware.camera2.params { method public android.util.Rational getElement(int, int); } - public final class DeviceStateOrientationMap { + public final class DeviceStateSensorOrientationMap { method public int getSensorOrientation(long); field public static final long FOLDED = 4L; // 0x4L field public static final long NORMAL = 0L; // 0x0L |