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

Commit 9aae943b authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Fix various nullability issues for Kotlin 2.1 

Bug: 399463072
Flag: EXEMPT minor refactor
Test: m out/soong/.intermediates/packages/apps/TvSystemUI/tests/TvSystemUITests/android_common/kotlin/TvSystemUITests.jar
Change-Id: I6e491e1463c67ad93ced13e3f0e7a050b9207ad0
(cherry picked from commit 3908ed02)
parent e053b373

packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/util/KeyguardTransitionRepositorySpySubject.kt

+2 −2
Original line number Diff line number Diff line
@@ -115,14 +115,14 @@ private constructor( 
        fun assertThat(

            repository: KeyguardTransitionRepository

        ): KeyguardTransitionRepositorySpySubject =

            assertAbout { failureMetadata, repository: KeyguardTransitionRepository ->

                assertAbout { failureMetadata, repository: KeyguardTransitionRepository? ->

                    if (!Mockito.mockingDetails(repository).isSpy) {

                        fail(

                            "Cannot assert on a non-spy KeyguardTransitionRepository. " +

                                "Use Mockito.spy(keyguardTransitionRepository)."

                        )

                    }

                    KeyguardTransitionRepositorySpySubject(failureMetadata, repository)

                    KeyguardTransitionRepositorySpySubject(failureMetadata, repository!!)

                }

                .that(repository)

    }

packages/SystemUI/tests/utils/src/com/android/systemui/qs/tiles/base/actions/QSTileIntentUserInputHandlerSubject.kt

+2 −2
Original line number Diff line number Diff line
@@ -68,8 +68,8 @@ private constructor( 
        ): QSTileIntentUserInputHandlerSubject =

            Truth.assertAbout {

                    failureMetadata: FailureMetadata,

                    subject: FakeQSTileIntentUserInputHandler ->

                    QSTileIntentUserInputHandlerSubject(failureMetadata, subject)

                    subject: FakeQSTileIntentUserInputHandler? ->

                    QSTileIntentUserInputHandlerSubject(failureMetadata, subject!!)

                }

                .that(handler)

    }

packages/SystemUI/tests/utils/src/com/android/systemui/qs/tiles/impl/custom/QSTileStateSubject.kt

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ private constructor(failureMetadata: FailureMetadata, subject: QSTileState?) : 
    companion object {



        /** Returns a factory to be used with [Truth.assertAbout]. */

        fun states(): Factory<QSTileStateSubject, QSTileState?> {

        fun states(): Factory<QSTileStateSubject, QSTileState> {

            return Factory { failureMetadata: FailureMetadata, subject: QSTileState? ->

                QSTileStateSubject(failureMetadata, subject)

            }

packages/SystemUI/tests/utils/src/com/android/systemui/qs/tiles/impl/custom/TileSubject.kt

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ class TileSubject private constructor(failureMetadata: FailureMetadata, subject: 
    companion object {



        /** Returns a factory to be used with [Truth.assertAbout]. */

        fun tiles(): Factory<TileSubject, Tile?> {

        fun tiles(): Factory<TileSubject, Tile> {

            return Factory { failureMetadata: FailureMetadata, subject: Tile? ->

                TileSubject(failureMetadata, subject)

            }

packages/SystemUI/tests/utils/src/com/android/systemui/truth/correspondence/FakeUiEvent.kt

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import com.google.common.truth.Correspondence 
object FakeUiEvent {

    val EVENT_ID =

        Correspondence.transforming<FakeUiEvent, Int>(

            { it?.eventId },

            { it.eventId },

            "has a eventId of",

        )

}