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

Commit fb03beea authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22102529



Change-Id: Ia7f9276d7791ba7e55a1078c3135b8ddee2bacdd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 815d00e0 bcdfa159

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())

    }