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

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

Merge "Enforce kotlin warnings as errors in InputTests" into udc-dev

parents e801ab56 0f5d9f63

tests/Input/Android.bp

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

        "src/**/*.kt",

    ],

    kotlincflags: [

        "-Werror",

    ],

    platform_apis: true,

    certificate: "platform",

    static_libs: [

tests/Input/src/com/android/test/input/AnrTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ class AnrTest { 
        val contentResolver = instrumentation.targetContext.contentResolver

        hideErrorDialogs = Settings.Global.getInt(contentResolver, HIDE_ERROR_DIALOGS, 0)

        Settings.Global.putInt(contentResolver, HIDE_ERROR_DIALOGS, 0)

        PACKAGE_NAME = UnresponsiveGestureMonitorActivity::class.java.getPackage().getName()

        PACKAGE_NAME = UnresponsiveGestureMonitorActivity::class.java.getPackage()!!.getName()

    }



    @After

tests/Input/src/com/android/test/input/UnresponsiveGestureMonitorActivity.kt

+2 −1
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ class UnresponsiveGestureMonitorActivity : Activity() { 
    private lateinit var mInputMonitor: InputMonitor

    override fun onCreate(savedInstanceState: Bundle?) {

        super.onCreate(savedInstanceState)

        mInputMonitor = InputManager.getInstance().monitorGestureInput(MONITOR_NAME, displayId)

        val inputManager = getSystemService(InputManager::class.java)

        mInputMonitor = inputManager.monitorGestureInput(MONITOR_NAME, displayId)

        mInputEventReceiver = UnresponsiveReceiver(

                mInputMonitor.getInputChannel(), Looper.myLooper())

    }