From 886b1a3d7cfc58bd2ae3664506f964ac41edb2fd Mon Sep 17 00:00:00 2001
From: Mark Renouf <mrenouf@google.com>
Date: Fri, 4 Jun 2021 13:12:19 -0400
Subject: [PATCH] ScrollCaptureTarget: enforce argument nullability in ctor

Bug: 180419562
Test: atest ScrollCaptureTargetTest
Change-Id: I390269c8cfc0ce57c5cf9b58ad0cbf75a0281b00
---
 core/java/android/view/ScrollCaptureTarget.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/java/android/view/ScrollCaptureTarget.java b/core/java/android/view/ScrollCaptureTarget.java
index 4fd48892da70e..44017ed0d8316 100644
--- a/core/java/android/view/ScrollCaptureTarget.java
+++ b/core/java/android/view/ScrollCaptureTarget.java
@@ -16,6 +16,8 @@
 
 package android.view;
 
+import static java.util.Objects.requireNonNull;
+
 import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.annotation.UiThread;
@@ -46,11 +48,11 @@ public final class ScrollCaptureTarget {
 
     public ScrollCaptureTarget(@NonNull View scrollTarget, @NonNull Rect localVisibleRect,
             @NonNull Point positionInWindow, @NonNull ScrollCaptureCallback callback) {
-        mContainingView = scrollTarget;
+        mContainingView = requireNonNull(scrollTarget);
         mHint = mContainingView.getScrollCaptureHint();
-        mCallback = callback;
-        mLocalVisibleRect = localVisibleRect;
-        mPositionInWindow = positionInWindow;
+        mCallback = requireNonNull(callback);
+        mLocalVisibleRect = requireNonNull(localVisibleRect);
+        mPositionInWindow = requireNonNull(positionInWindow);
     }
 
     /**