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

Commit d71d9086 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: 5ec41c25 

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



Change-Id: I8c40ac17e7a6f092bb7355975ae71a5cae7469ec
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 487cebae 5ec41c25

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -18285,7 +18285,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);