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

Merge "Camera: Validate physical setting map in OutputConfiguration.writeParcel" into tm-dev am: 868bff5d75

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17491592

Change-Id: I26582593f88e543561e4e719a913a775f090a28e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Shuzhen Wang
2022-04-06 17:43:33 +00:00
committed by Automerger Merge Worker
parent 9447075100 868bff5d75
commit a594d4ca8f
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/hardware/camera2/CaptureRequest.java
View File

@@ -623,6 +623,11 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
@Override @Override
public void writeToParcel(Parcel dest, int flags) { public void writeToParcel(Parcel dest, int flags) {
if (!mPhysicalCameraSettings.containsKey(mLogicalCameraId)) {
throw new IllegalStateException("Physical camera settings map must contain a key for "
+ "the logical camera id.");
}
int physicalCameraCount = mPhysicalCameraSettings.size(); int physicalCameraCount = mPhysicalCameraSettings.size();
dest.writeInt(physicalCameraCount); dest.writeInt(physicalCameraCount);
//Logical camera id and settings always come first. //Logical camera id and settings always come first.