Fix kotlin nullable errors in frameworks/libs/systemui

Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.

Bug: 294110802
Test: builds
Change-Id: If8dc1d32d7fd02e41c12cfb1571374c1e974e87c

4 files changed, 31 insertions, 11 deletions

diff --git a/motiontoollib/tests/com/android/app/motiontool/DdmHandleMotionToolTest.kt b/motiontoollib/tests/com/android/app/motiontool/DdmHandleMotionToolTest.kt
index f330980..f112d0b 100644
--- a/motiontoollib/tests/com/android/app/motiontool/DdmHandleMotionToolTest.kt
+++ b/motiontoollib/tests/com/android/app/motiontool/DdmHandleMotionToolTest.kt
@@ -130,7 +130,10 @@ class DdmHandleMotionToolTest {
             val traceId = beginTraceResponse.beginTrace.traceId
 
             Choreographer.getInstance().postFrameCallback {
-                activity.findViewById<View>(android.R.id.content).viewTreeObserver.dispatchOnDraw()
+                activity
+                    .requireViewById<View>(android.R.id.content)
+                    .viewTreeObserver
+                    .dispatchOnDraw()
 
                 val pollTraceResponse = performPollTraceRequest(traceId)
                 assertEquals(1, pollTraceResponse.pollTrace.data.frameDataList.size)
diff --git a/motiontoollib/tests/com/android/app/motiontool/MotionToolManagerTest.kt b/motiontoollib/tests/com/android/app/motiontool/MotionToolManagerTest.kt
index c522d0c..05400a2 100644
--- a/motiontoollib/tests/com/android/app/motiontool/MotionToolManagerTest.kt
+++ b/motiontoollib/tests/com/android/app/motiontool/MotionToolManagerTest.kt
@@ -85,7 +85,10 @@ class MotionToolManagerTest {
         activityScenarioRule.scenario.onActivity { activity ->
             val traceId = motionToolManager.beginTrace(getActivityViewRootId())
             Choreographer.getInstance().postFrameCallback {
-                activity.findViewById<View>(android.R.id.content).viewTreeObserver.dispatchOnDraw()
+                activity
+                    .requireViewById<View>(android.R.id.content)
+                    .viewTreeObserver
+                    .dispatchOnDraw()
 
                 val polledData = motionToolManager.pollTrace(traceId)
                 assertEquals(1, polledData.frameDataList.size)
diff --git a/viewcapturelib/tests/com/android/app/viewcapture/SettingsAwareViewCaptureTest.kt b/viewcapturelib/tests/com/android/app/viewcapture/SettingsAwareViewCaptureTest.kt
index 631ce85..15352aa 100644
--- a/viewcapturelib/tests/com/android/app/viewcapture/SettingsAwareViewCaptureTest.kt
+++ b/viewcapturelib/tests/com/android/app/viewcapture/SettingsAwareViewCaptureTest.kt
@@ -51,14 +51,21 @@ class SettingsAwareViewCaptureTest {
 
         activityScenarioRule.scenario.onActivity { activity ->
             val viewCapture: ViewCapture = SettingsAwareViewCapture(context, MAIN_EXECUTOR)
-            val rootView: View = activity.findViewById(android.R.id.content)
+            val rootView: View = activity.requireViewById(android.R.id.content)
 
             val closeable: SafeCloseable = viewCapture.startCapture(rootView, "rootViewId")
             Choreographer.getInstance().postFrameCallback {
                 rootView.viewTreeObserver.dispatchOnDraw()
 
-                assertEquals(0, viewCapture.getDumpTask(
-                        activity.findViewById(android.R.id.content)).get().get().frameDataList.size)
+                assertEquals(
+                    0,
+                    viewCapture
+                        .getDumpTask(activity.requireViewById(android.R.id.content))
+                        .get()
+                        .get()
+                        .frameDataList
+                        .size
+                )
                 closeable.close()
             }
         }
@@ -70,14 +77,21 @@ class SettingsAwareViewCaptureTest {
 
         activityScenarioRule.scenario.onActivity { activity ->
             val viewCapture: ViewCapture = SettingsAwareViewCapture(context, MAIN_EXECUTOR)
-            val rootView: View = activity.findViewById(android.R.id.content)
+            val rootView: View = activity.requireViewById(android.R.id.content)
 
             val closeable: SafeCloseable = viewCapture.startCapture(rootView, "rootViewId")
             Choreographer.getInstance().postFrameCallback {
                 rootView.viewTreeObserver.dispatchOnDraw()
 
-                assertEquals(1, viewCapture.getDumpTask(activity.findViewById(
-                        android.R.id.content)).get().get().frameDataList.size)
+                assertEquals(
+                    1,
+                    viewCapture
+                        .getDumpTask(activity.requireViewById(android.R.id.content))
+                        .get()
+                        .get()
+                        .frameDataList
+                        .size
+                )
 
                 closeable.close()
             }
diff --git a/viewcapturelib/tests/com/android/app/viewcapture/ViewCaptureTest.kt b/viewcapturelib/tests/com/android/app/viewcapture/ViewCaptureTest.kt
index 47f1a7b..e3272c4 100644
--- a/viewcapturelib/tests/com/android/app/viewcapture/ViewCaptureTest.kt
+++ b/viewcapturelib/tests/com/android/app/viewcapture/ViewCaptureTest.kt
@@ -52,7 +52,7 @@ class ViewCaptureTest {
     fun testWindowListenerDumpsOneFrameAfterInvalidate() {
         activityScenarioRule.scenario.onActivity { activity ->
             val closeable = startViewCaptureAndInvalidateNTimes(1, activity)
-            val rootView = activity.findViewById<View>(android.R.id.content)
+            val rootView = activity.requireViewById<View>(android.R.id.content)
             val data = viewCapture.getDumpTask(rootView).get().get()
 
             assertEquals(1, data.frameDataList.size)
@@ -65,7 +65,7 @@ class ViewCaptureTest {
     fun testWindowListenerDumpsCorrectlyAfterRecyclingStarted() {
         activityScenarioRule.scenario.onActivity { activity ->
             val closeable = startViewCaptureAndInvalidateNTimes(memorySize + 5, activity)
-            val rootView = activity.findViewById<View>(android.R.id.content)
+            val rootView = activity.requireViewById<View>(android.R.id.content)
             val data = viewCapture.getDumpTask(rootView).get().get()
 
             // since ViewCapture MEMORY_SIZE is [viewCaptureMemorySize], only
@@ -78,7 +78,7 @@ class ViewCaptureTest {
     }
 
     private fun startViewCaptureAndInvalidateNTimes(n: Int, activity: TestActivity): SafeCloseable {
-        val rootView: View = activity.findViewById(android.R.id.content)
+        val rootView: View = activity.requireViewById(android.R.id.content)
         val closeable: SafeCloseable = viewCapture.startCapture(rootView, "rootViewId")
         dispatchOnDraw(rootView, times = n)
         return closeable