Merge "Add missing nullability annotations" (d4deaec1) · Commits · e / os / android_frameworks_base

api/current.txt

+20 −20

Original line number	Diff line number	Diff line
		@@ -50390,34 +50390,34 @@ package android.view {
		}

		public class TextureView extends android.view.View {
		ctor public TextureView(android.content.Context);
		ctor public TextureView(android.content.Context, android.util.AttributeSet);
		ctor public TextureView(android.content.Context, android.util.AttributeSet, int);
		ctor public TextureView(android.content.Context, android.util.AttributeSet, int, int);
		ctor public TextureView(@NonNull android.content.Context);
		ctor public TextureView(@NonNull android.content.Context, @Nullable android.util.AttributeSet);
		ctor public TextureView(@NonNull android.content.Context, @Nullable android.util.AttributeSet, int);
		ctor public TextureView(@NonNull android.content.Context, @Nullable android.util.AttributeSet, int, int);
		method public final void draw(android.graphics.Canvas);
		method public android.graphics.Bitmap getBitmap();
		method public android.graphics.Bitmap getBitmap(int, int);
		method public android.graphics.Bitmap getBitmap(android.graphics.Bitmap);
		method public android.graphics.SurfaceTexture getSurfaceTexture();
		method public android.view.TextureView.SurfaceTextureListener getSurfaceTextureListener();
		method public android.graphics.Matrix getTransform(android.graphics.Matrix);
		method @Nullable public android.graphics.Bitmap getBitmap();
		method @Nullable public android.graphics.Bitmap getBitmap(int, int);
		method @NonNull public android.graphics.Bitmap getBitmap(@NonNull android.graphics.Bitmap);
		method @Nullable public android.graphics.SurfaceTexture getSurfaceTexture();
		method @Nullable public android.view.TextureView.SurfaceTextureListener getSurfaceTextureListener();
		method @NonNull public android.graphics.Matrix getTransform(@Nullable android.graphics.Matrix);
		method public boolean isAvailable();
		method public android.graphics.Canvas lockCanvas();
		method public android.graphics.Canvas lockCanvas(android.graphics.Rect);
		method @Nullable public android.graphics.Canvas lockCanvas();
		method @Nullable public android.graphics.Canvas lockCanvas(@Nullable android.graphics.Rect);
		method protected final void onDraw(android.graphics.Canvas);
		method public void setBackgroundDrawable(android.graphics.drawable.Drawable);
		method public void setOpaque(boolean);
		method public void setSurfaceTexture(android.graphics.SurfaceTexture);
		method public void setSurfaceTextureListener(android.view.TextureView.SurfaceTextureListener);
		method public void setTransform(android.graphics.Matrix);
		method public void unlockCanvasAndPost(android.graphics.Canvas);
		method public void setSurfaceTexture(@NonNull android.graphics.SurfaceTexture);
		method public void setSurfaceTextureListener(@Nullable android.view.TextureView.SurfaceTextureListener);
		method public void setTransform(@Nullable android.graphics.Matrix);
		method public void unlockCanvasAndPost(@NonNull android.graphics.Canvas);
		}

		public static interface TextureView.SurfaceTextureListener {
		method public void onSurfaceTextureAvailable(android.graphics.SurfaceTexture, int, int);
		method public boolean onSurfaceTextureDestroyed(android.graphics.SurfaceTexture);
		method public void onSurfaceTextureSizeChanged(android.graphics.SurfaceTexture, int, int);
		method public void onSurfaceTextureUpdated(android.graphics.SurfaceTexture);
		method public void onSurfaceTextureAvailable(@NonNull android.graphics.SurfaceTexture, int, int);
		method public boolean onSurfaceTextureDestroyed(@NonNull android.graphics.SurfaceTexture);
		method public void onSurfaceTextureSizeChanged(@NonNull android.graphics.SurfaceTexture, int, int);
		method public void onSurfaceTextureUpdated(@NonNull android.graphics.SurfaceTexture);
		}

		public class TouchDelegate {

core/java/android/view/TextureView.java

+34 −32

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.view;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.UnsupportedAppUsage;
		import android.content.Context;
		@@ -139,7 +140,7 @@ public class TextureView extends View {
		*
		* @param context The context to associate this view with.
		*/
		public TextureView(Context context) {
		public TextureView(@NonNull Context context) {
		super(context);
		}

		@@ -149,7 +150,7 @@ public class TextureView extends View {
		* @param context The context to associate this view with.
		* @param attrs The attributes of the XML tag that is inflating the view.
		*/
		public TextureView(Context context, AttributeSet attrs) {
		public TextureView(@NonNull Context context, @Nullable AttributeSet attrs) {
		super(context, attrs);
		}

		@@ -162,7 +163,7 @@ public class TextureView extends View {
		* reference to a style resource that supplies default values for
		* the view. Can be 0 to not look for defaults.
		*/
		public TextureView(Context context, AttributeSet attrs, int defStyleAttr) {
		public TextureView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
		super(context, attrs, defStyleAttr);
		}

		@@ -179,7 +180,8 @@ public class TextureView extends View {
		* defStyleAttr is 0 or can not be found in the theme. Can be 0
		* to not look for defaults.
		*/
		public TextureView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
		public TextureView(@NonNull Context context, @Nullable AttributeSet attrs,
		int defStyleAttr, int defStyleRes) {
		super(context, attrs, defStyleAttr, defStyleRes);
		}

		@@ -484,13 +486,13 @@ public class TextureView extends View {
		* situations, make sure this texture view is not marked opaque.</p>
		*
		* @param transform The transform to apply to the content of
		* this view.
		* this view. If null the transform will be set to identity.
		*
		* @see #getTransform(android.graphics.Matrix)
		* @see #isOpaque()
		* @see #setOpaque(boolean)
		*/
		public void setTransform(Matrix transform) {
		public void setTransform(@Nullable Matrix transform) {
		mMatrix.set(transform);
		mMatrixChanged = true;
		invalidateParentIfNeeded();
		@@ -507,7 +509,7 @@ public class TextureView extends View {
		*
		* @see #setTransform(android.graphics.Matrix)
		*/
		public Matrix getTransform(Matrix transform) {
		public @NonNull Matrix getTransform(@Nullable Matrix transform) {
		if (transform == null) {
		transform = new Matrix();
		}
		@@ -544,7 +546,7 @@ public class TextureView extends View {
		* @see #getBitmap(android.graphics.Bitmap)
		* @see #getBitmap(int, int)
		*/
		public Bitmap getBitmap() {
		public @Nullable Bitmap getBitmap() {
		return getBitmap(getWidth(), getHeight());
		}

		@@ -571,7 +573,7 @@ public class TextureView extends View {
		* @see #getBitmap(android.graphics.Bitmap)
		* @see #getBitmap()
		*/
		public Bitmap getBitmap(int width, int height) {
		public @Nullable Bitmap getBitmap(int width, int height) {
		if (isAvailable() && width > 0 && height > 0) {
		return getBitmap(Bitmap.createBitmap(getResources().getDisplayMetrics(),
		width, height, Bitmap.Config.ARGB_8888));
		@@ -602,7 +604,7 @@ public class TextureView extends View {
		* @throws IllegalStateException if the hardware rendering context cannot be
		* acquired to capture the bitmap
		*/
		public Bitmap getBitmap(Bitmap bitmap) {
		public @NonNull Bitmap getBitmap(@NonNull Bitmap bitmap) {
		if (bitmap != null && isAvailable()) {
		applyUpdate();
		applyTransformMatrix();
		@@ -649,12 +651,13 @@ public class TextureView extends View {
		* owned by another producer. For instance, if the TextureView is being used
		* to render the camera's preview you cannot invoke this method.</p>
		*
		* @return A Canvas used to draw into the surface.
		* @return A Canvas used to draw into the surface, or null if the surface cannot be locked for
		* drawing (see {@link #isAvailable()}).
		*
		* @see #lockCanvas(android.graphics.Rect)
		* @see #unlockCanvasAndPost(android.graphics.Canvas)
		*/
		public Canvas lockCanvas() {
		public @Nullable Canvas lockCanvas() {
		return lockCanvas(null);
		}

		@@ -669,15 +672,17 @@ public class TextureView extends View {
		* already connected to an image producer (for instance: the camera,
		* OpenGL, a media player, etc.)
		*
		* @param dirty Area of the surface that will be modified.
		* @param dirty Area of the surface that will be modified. If null the area of the entire
		* surface is used.

		* @return A Canvas used to draw into the surface.
		* @return A Canvas used to draw into the surface, or null if the surface cannot be locked for
		* drawing (see {@link #isAvailable()}).
		*
		* @see #lockCanvas()
		* @see #unlockCanvasAndPost(android.graphics.Canvas)
		* @see #isAvailable()
		*/
		public Canvas lockCanvas(Rect dirty) {
		public @Nullable Canvas lockCanvas(@Nullable Rect dirty) {
		if (!isAvailable()) return null;

		if (mCanvas == null) {
		@@ -705,7 +710,7 @@ public class TextureView extends View {
		* @see #lockCanvas()
		* @see #lockCanvas(android.graphics.Rect)
		*/
		public void unlockCanvasAndPost(Canvas canvas) {
		public void unlockCanvasAndPost(@NonNull Canvas canvas) {
		if (mCanvas != null && canvas == mCanvas) {
		canvas.restoreToCount(mSaveCount);
		mSaveCount = 0;
		@@ -723,7 +728,7 @@ public class TextureView extends View {
		*
		* @see #isAvailable()
		*/
		public SurfaceTexture getSurfaceTexture() {
		public @Nullable SurfaceTexture getSurfaceTexture() {
		return mSurface;
		}

		@@ -742,7 +747,7 @@ public class TextureView extends View {
		* @param surfaceTexture The {@link SurfaceTexture} that the view should use.
		* @see SurfaceTexture#detachFromGLContext()
		*/
		public void setSurfaceTexture(SurfaceTexture surfaceTexture) {
		public void setSurfaceTexture(@NonNull SurfaceTexture surfaceTexture) {
		if (surfaceTexture == null) {
		throw new NullPointerException("surfaceTexture must not be null");
		}
		@@ -781,7 +786,7 @@ public class TextureView extends View {
		* @see #setSurfaceTextureListener(android.view.TextureView.SurfaceTextureListener)
		* @see SurfaceTextureListener
		*/
		public SurfaceTextureListener getSurfaceTextureListener() {
		public @Nullable SurfaceTextureListener getSurfaceTextureListener() {
		return mListener;
		}

		@@ -792,25 +797,22 @@ public class TextureView extends View {
		* @see #getSurfaceTextureListener()
		* @see SurfaceTextureListener
		*/
		public void setSurfaceTextureListener(SurfaceTextureListener listener) {
		public void setSurfaceTextureListener(@Nullable SurfaceTextureListener listener) {
		mListener = listener;
		}

		@UnsupportedAppUsage
		private final SurfaceTexture.OnFrameAvailableListener mUpdateListener =
		new SurfaceTexture.OnFrameAvailableListener() {
		@Override
		public void onFrameAvailable(SurfaceTexture surfaceTexture) {
		surfaceTexture -> {
		updateLayer();
		invalidate();
		}
		};

		/**
		* This listener can be used to be notified when the surface texture
		* associated with this texture view is available.
		*/
		public static interface SurfaceTextureListener {
		public interface SurfaceTextureListener {
		/**
		* Invoked when a {@link TextureView}'s SurfaceTexture is ready for use.
		*
		@@ -819,7 +821,7 @@ public class TextureView extends View {
		* @param width The width of the surface
		* @param height The height of the surface
		*/
		public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height);
		void onSurfaceTextureAvailable(@NonNull SurfaceTexture surface, int width, int height);

		/**
		* Invoked when the {@link SurfaceTexture}'s buffers size changed.
		@@ -829,7 +831,7 @@ public class TextureView extends View {
		* @param width The new width of the surface
		* @param height The new height of the surface
		*/
		public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height);
		void onSurfaceTextureSizeChanged(@NonNull SurfaceTexture surface, int width, int height);

		/**
		* Invoked when the specified {@link SurfaceTexture} is about to be destroyed.
		@@ -839,7 +841,7 @@ public class TextureView extends View {
		*
		* @param surface The surface about to be destroyed
		*/
		public boolean onSurfaceTextureDestroyed(SurfaceTexture surface);
		boolean onSurfaceTextureDestroyed(@NonNull SurfaceTexture surface);

		/**
		* Invoked when the specified {@link SurfaceTexture} is updated through
		@@ -847,7 +849,7 @@ public class TextureView extends View {
		*
		* @param surface The surface just updated
		*/
		public void onSurfaceTextureUpdated(SurfaceTexture surface);
		void onSurfaceTextureUpdated(@NonNull SurfaceTexture surface);
		}

		@UnsupportedAppUsage