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

Commit fe5b06e5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update API text file format to include missing generic signature" am:... 

Merge "Update API text file format to include missing generic signature" am: 5ec41c25 am: d71d9086 am: bdd41e7b am: 87e9991b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2453865



Change-Id: I82719dfb5c88c63e5a797caee86dbeecc349d6d5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 691fc349 87e9991b

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -19370,7 +19370,7 @@ package android.hardware.camera2.params { 
  public final class OutputConfiguration implements android.os.Parcelable {

    ctor public OutputConfiguration(@NonNull android.view.Surface);

    ctor public OutputConfiguration(int, @NonNull android.view.Surface);

    ctor public OutputConfiguration(@NonNull android.util.Size, @NonNull Class<T>);

    ctor public <T> OutputConfiguration(@NonNull android.util.Size, @NonNull Class<T>);

    method public void addSensorPixelModeUsed(int);

    method public void addSurface(@NonNull android.view.Surface);

    method @NonNull public static java.util.Collection<android.hardware.camera2.params.OutputConfiguration> createInstancesForMultiResolutionOutput(@NonNull android.hardware.camera2.MultiResolutionImageReader);