Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "camera2: Fix backward compatibility breakage for setting metering regions." into sc-dev

Browse Source
This commit is contained in:
Jayant Chowdhary
2021-08-05 18:03:45 +00:00
committed by Android (Google) Code Review
parent 7a3193ae7a d3c86632f8
commit 4eeeee0f14
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/java/android/hardware/camera2/impl/CameraMetadataNative.java
View File

@@ -1720,21 +1720,21 @@ public class CameraMetadataNative implements Parcelable {
new SetCommand() { new SetCommand() {
@Override @Override
public <T> void setValue(CameraMetadataNative metadata, T value) { public <T> void setValue(CameraMetadataNative metadata, T value) {
metadata.setAWBRegions((MeteringRectangle[]) value); metadata.setAWBRegions(value);
} }
}); });
sSetCommandMap.put(CaptureRequest.CONTROL_AF_REGIONS.getNativeKey(), sSetCommandMap.put(CaptureRequest.CONTROL_AF_REGIONS.getNativeKey(),
new SetCommand() { new SetCommand() {
@Override @Override
public <T> void setValue(CameraMetadataNative metadata, T value) { public <T> void setValue(CameraMetadataNative metadata, T value) {
metadata.setAFRegions((MeteringRectangle[]) value); metadata.setAFRegions(value);
} }
}); });
sSetCommandMap.put(CaptureRequest.CONTROL_AE_REGIONS.getNativeKey(), sSetCommandMap.put(CaptureRequest.CONTROL_AE_REGIONS.getNativeKey(),
new SetCommand() { new SetCommand() {
@Override @Override
public <T> void setValue(CameraMetadataNative metadata, T value) { public <T> void setValue(CameraMetadataNative metadata, T value) {
metadata.setAERegions((MeteringRectangle[]) value); metadata.setAERegions(value);
} }
}); });
} }
@@ -1815,30 +1815,33 @@ public class CameraMetadataNative implements Parcelable {
return true; return true;
} }
private <T> boolean setAFRegions(MeteringRectangle[] afRegions) { private <T> boolean setAFRegions(T afRegions) {
if (afRegions == null) { if (afRegions == null) {
return false; return false;
} }
setBase(CaptureRequest.CONTROL_AF_REGIONS_SET, true); setBase(CaptureRequest.CONTROL_AF_REGIONS_SET, true);
setBase(CaptureRequest.CONTROL_AF_REGIONS, afRegions); // The cast to CaptureRequest.Key is needed since java does not support template
// specialization and we need to route this method to
// setBase(CaptureRequest.Key<T> key, T value)
setBase((CaptureRequest.Key)CaptureRequest.CONTROL_AF_REGIONS, afRegions);
return true; return true;
} }
private <T> boolean setAERegions(MeteringRectangle[] aeRegions) { private <T> boolean setAERegions(T aeRegions) {
if (aeRegions == null) { if (aeRegions == null) {
return false; return false;
} }
setBase(CaptureRequest.CONTROL_AE_REGIONS_SET, true); setBase(CaptureRequest.CONTROL_AE_REGIONS_SET, true);
setBase(CaptureRequest.CONTROL_AE_REGIONS, aeRegions); setBase((CaptureRequest.Key)CaptureRequest.CONTROL_AE_REGIONS, aeRegions);
return true; return true;
} }
private <T> boolean setAWBRegions(MeteringRectangle[] awbRegions) { private <T> boolean setAWBRegions(T awbRegions) {
if (awbRegions == null) { if (awbRegions == null) {
return false; return false;
} }
setBase(CaptureRequest.CONTROL_AWB_REGIONS_SET, true); setBase(CaptureRequest.CONTROL_AWB_REGIONS_SET, true);
setBase(CaptureRequest.CONTROL_AWB_REGIONS, awbRegions); setBase((CaptureRequest.Key)CaptureRequest.CONTROL_AWB_REGIONS, awbRegions);
return true; return true;
} }