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

Merge "Camera2: Handle (0, 0) size for deferred OutputConfiguration"

Browse Source
This commit is contained in:
Shuzhen Wang
2017-01-25 21:05:42 +00:00
committed by Android (Google) Code Review
parent e363f427f8 e56e606f82
commit b44dee8e22
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/hardware/camera2/params/OutputConfiguration.java
View File

@@ -358,7 +358,12 @@ public final class OutputConfiguration implements Parcelable {
throw new IllegalArgumentException("Exceeds maximum number of surfaces");
}
if (!mConfiguredSize.equals(SurfaceUtils.getSurfaceSize(surface))) {
// TODO: b/34697112. This needs to be reverted once app fix is merged.
// Do not throw exception for below case:
// - OutputConfiguration(Size(0, 0), klass)
// - addSurface(surface)
if ((mConfiguredSize.getWidth() != 0 || mConfiguredSize.getHeight() != 0) &&
!mConfiguredSize.equals(SurfaceUtils.getSurfaceSize(surface))) {
throw new IllegalArgumentException("The size of added surface doesn't match");
}
if (mConfiguredDataspace != SurfaceUtils.getSurfaceDataspace(surface)) {