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

Commit f6659f96 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Camera: "getMaxSharedSurfaceCount" should be non-static"

parents dd020f6f 31c11a05

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -16374,7 +16374,7 @@ package android.hardware.camera2.params { 
    method public void addSurface(android.view.Surface);

    method public int describeContents();

    method public void enableSurfaceSharing();

    method public static int getMaxSharedSurfaceCount();

    method public int getMaxSharedSurfaceCount();

    method public android.view.Surface getSurface();

    method public int getSurfaceGroupId();

    method public java.util.List<android.view.Surface> getSurfaces();

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

+1 −1
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ public final class OutputConfiguration implements Parcelable { 
     *

     * @see #enableSurfaceSharing

     */

    public static int getMaxSharedSurfaceCount() {

    public int getMaxSharedSurfaceCount() {

        return MAX_SURFACES_COUNT;

    }