diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-06-23 06:06:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-23 06:07:04 +0000 |
| commit | b14a1ac057879108bd53ab54c10869f7539ecdf8 (patch) | |
| tree | 6a65e70c1dab36c0a590a03266fc33e3096ecad0 /api/system-current.txt | |
| parent | 4d30d342941effb8ac0b17650473a8b937aee591 (diff) | |
| parent | e365120aaead97567bdfbc53d3bfc2699bd2f886 (diff) | |
| download | frameworks_base-b14a1ac057879108bd53ab54c10869f7539ecdf8.zip frameworks_base-b14a1ac057879108bd53ab54c10869f7539ecdf8.tar.gz frameworks_base-b14a1ac057879108bd53ab54c10869f7539ecdf8.tar.bz2 | |
Merge changes from topic 'remove-high-res' into mnc-dev
* changes:
Camera2: Fix StreamConfigurationMap#isOutputSupportedFor for depth
Camera2: Remove HIGH_RESOLUTION level and modify FULL requirements
Diffstat (limited to 'api/system-current.txt')
| -rw-r--r-- | api/system-current.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index ba9fff7..ce4f399 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -13831,7 +13831,6 @@ package android.hardware.camera2 { field public static final int HOT_PIXEL_MODE_HIGH_QUALITY = 2; // 0x2 field public static final int HOT_PIXEL_MODE_OFF = 0; // 0x0 field public static final int INFO_SUPPORTED_HARDWARE_LEVEL_FULL = 1; // 0x1 - field public static final int INFO_SUPPORTED_HARDWARE_LEVEL_HIGH_RESOLUTION = 3; // 0x3 field public static final int INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY = 2; // 0x2 field public static final int INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED = 0; // 0x0 field public static final int LENS_FACING_BACK = 1; // 0x1 @@ -14184,6 +14183,7 @@ package android.hardware.camera2.params { } public final class StreamConfigurationMap { + method public android.util.Size[] getHighResolutionOutputSizes(int); method public android.util.Range<java.lang.Integer>[] getHighSpeedVideoFpsRanges(); method public android.util.Range<java.lang.Integer>[] getHighSpeedVideoFpsRangesFor(android.util.Size); method public android.util.Size[] getHighSpeedVideoSizes(); |