Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e56e606f authored by Shuzhen Wang's avatar Shuzhen Wang
Browse files

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

We need to handle below sequence of events:
1. OutputConfiguration(Size(0, 0), klass)
2. addSurface(surface)
3. createCameraCaptureSession

In this case, allow the addSurface() to succeed.

Test: camera works in keep/hangouts/contacts
Bug: 34697112
Change-Id: I726c60cce9a11c69b050aad47f4ed4a0a7a0870e
parent ff256204

core/java/android/hardware/camera2/params/OutputConfiguration.java

+6 −1
Original line number Diff line number Diff line
@@ -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)) {