diff options
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/hardware/camera2/params/OutputConfiguration.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index b18115eb38fc..44f2f0836049 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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(); diff --git a/core/java/android/hardware/camera2/params/OutputConfiguration.java b/core/java/android/hardware/camera2/params/OutputConfiguration.java index f47cd665fd9c..eb4bcededbf2 100644 --- a/core/java/android/hardware/camera2/params/OutputConfiguration.java +++ b/core/java/android/hardware/camera2/params/OutputConfiguration.java @@ -576,7 +576,7 @@ public final class OutputConfiguration implements Parcelable { * * @see #enableSurfaceSharing */ - public static int getMaxSharedSurfaceCount() { + public int getMaxSharedSurfaceCount() { return MAX_SURFACES_COUNT; } |