SurfaceControl, Surface: Add nullability annotations.
In response to API Feedback.
Test: Builds
Bug: 126700125
Bug: 126360307
Change-Id: I17a14fd0d1b527ee38f68935cddee73fb4d10195
diff --git a/api/current.txt b/api/current.txt
index 7007e3c..d079f01 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -50061,7 +50061,7 @@
}
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();
@@ -50095,10 +50095,10 @@
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);
}
diff --git a/core/java/android/view/Surface.java b/core/java/android/view/Surface.java
index 6ff699e..cb64ab1 100644
--- a/core/java/android/view/Surface.java
+++ b/core/java/android/view/Surface.java
@@ -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 @@
*
* @param from The SurfaceControl to assosciate this Surface with
*/
- public Surface(SurfaceControl from) {
+ public Surface(@NonNull SurfaceControl from) {
copyFrom(from);
}
diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java
index 5e2aaae..998ad2a 100644
--- a/core/java/android/view/SurfaceControl.java
+++ b/core/java/android/view/SurfaceControl.java
@@ -459,6 +459,7 @@
* 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 @@
*
* @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 @@
* @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) {