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

Commit c2bbc70a authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Treat kotlin warnings as errors in InputTests" into main

parents b42e8cd7 825c259c

tests/Input/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ android_test { 
        "src/**/*.java",

        "src/**/*.kt",

    ],

    kotlincflags: [

        "-Werror",

    ],

    asset_dirs: ["assets"],

    platform_apis: true,

    certificate: "platform",

tests/Input/src/com/android/server/input/KeyGestureControllerTests.kt

+6 −4
Original line number Diff line number Diff line
@@ -297,10 +297,12 @@ class KeyGestureControllerTests { 
                },

            )

        Mockito.`when`(inputManager.registerKeyGestureEventHandler(any(), any())).thenAnswer {

            val args = it.arguments

            if (args[0] != null) {

                val gestures = args[0] as List<Int>

                val handler = args[1] as InputManager.KeyGestureEventHandler

            val gestures = it.getArgument<List<Int>>(0)

            if (gestures != null) {

                val handler = it.getArgument<InputManager.KeyGestureEventHandler>(1)

                requireNotNull(handler) {

                    "Handler argument cannot be null when gestures are provided"

                }

                keyGestureController.registerKeyGestureHandler(

                    gestures.toIntArray(),

                    KeyGestureHandler { event, token ->