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

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

Merge "SurfaceControl, Surface: Add nullability annotations."

parents f19439cc da1d242c

api/current.txt

+4 −4
Original line number Diff line number Diff line
@@ -50079,7 +50079,7 @@ package android.view { 
  }















  public class Surface implements android.os.Parcelable {













    ctor public Surface(android.view.SurfaceControl);













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















    ctor public Surface(android.graphics.SurfaceTexture);















    method public int describeContents();















    method public boolean isValid();










@@ -50113,10 +50113,10 @@ package android.view {



























  public static class SurfaceControl.Builder {















    ctor public SurfaceControl.Builder();













    method public android.view.SurfaceControl build();













    method public android.view.SurfaceControl.Builder setBufferSize(@IntRange(from=0) int, @IntRange(from=0) int);













    method @NonNull public android.view.SurfaceControl build();













    method @NonNull public android.view.SurfaceControl.Builder setBufferSize(@IntRange(from=0) int, @IntRange(from=0) int);















    method @NonNull public android.view.SurfaceControl.Builder setFormat(int);













    method public android.view.SurfaceControl.Builder setName(String);













    method @NonNull public android.view.SurfaceControl.Builder setName(@NonNull String);















    method @NonNull public android.view.SurfaceControl.Builder setOpaque(boolean);















    method @NonNull public android.view.SurfaceControl.Builder setParent(@Nullable android.view.SurfaceControl);















  }

























core/java/android/view/Surface.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -17,6 +17,7 @@













package android.view;































import android.annotation.IntDef;













import android.annotation.NonNull;















import android.annotation.UnsupportedAppUsage;















import android.content.res.CompatibilityInfo.Translator;















import android.graphics.Canvas;










@@ -193,7 +194,7 @@ public class Surface implements Parcelable {













     *















     * @param from The SurfaceControl to assosciate this Surface with















     */













    public Surface(SurfaceControl from) {













    public Surface(@NonNull SurfaceControl from) {















        copyFrom(from);















    }

















































core/java/android/view/SurfaceControl.java



+4
−1




























Original line number
Diff line number
Diff line








@@ -459,6 +459,7 @@ public final class SurfaceControl implements Parcelable {













         * Construct a new {@link SurfaceControl} with the set parameters. The builder















         * remains valid.















         */













        @NonNull















        public SurfaceControl build() {















            if (mWidth < 0 || mHeight < 0) {















                throw new IllegalArgumentException(









@@ -477,7 +478,8 @@ public final class SurfaceControl implements Parcelable {













         *















         * @param name A name to identify the Surface in debugging.















         */













        public Builder setName(String name) {













        @NonNull













        public Builder setName(@NonNull String name) {















            mName = name;















            return this;















        }









@@ -488,6 +490,7 @@ public final class SurfaceControl implements Parcelable {













         * @param width The buffer width in pixels.















         * @param height The buffer height in pixels.















         */













        @NonNull















        public Builder setBufferSize(@IntRange(from = 0) int width,















                @IntRange(from = 0) int height) {















            if (width < 0 || height < 0) {