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

Commit 6aaf864a authored by Colin Cross's avatar Colin Cross
Browse files

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
parent 3b874213

motiontoollib/tests/com/android/app/motiontool/DdmHandleMotionToolTest.kt

+4 −1
Original line number Diff line number Diff line
@@ -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)

motiontoollib/tests/com/android/app/motiontool/MotionToolManagerTest.kt

+4 −1
Original line number Diff line number Diff line
@@ -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)

viewcapturelib/tests/com/android/app/viewcapture/SettingsAwareViewCaptureTest.kt

+20 −6
Original line number Diff line number Diff line
@@ -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()

            }

viewcapturelib/tests/com/android/app/viewcapture/ViewCaptureTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -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