diff options
| author | 2023-03-16 15:54:31 +0000 | |
|---|---|---|
| committer | 2023-03-16 15:54:31 +0000 | |
| commit | bcdfa159c98399083d385248cac20cb82e837e8b (patch) | |
| tree | d3c7c85a70fef4dd7feac5ba462d6cab44e97b8d | |
| parent | e801ab56338c50eb8d315fb67f246d41bace6030 (diff) | |
| parent | 0f5d9f63095b374e16a1f61a57968c6646f3e91f (diff) | |
Merge "Enforce kotlin warnings as errors in InputTests" into udc-dev
| -rw-r--r-- | tests/Input/Android.bp | 3 | ||||
| -rw-r--r-- | tests/Input/src/com/android/test/input/AnrTest.kt | 2 | ||||
| -rw-r--r-- | tests/Input/src/com/android/test/input/UnresponsiveGestureMonitorActivity.kt | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/tests/Input/Android.bp b/tests/Input/Android.bp index 83893ba46885..a4c48fd5f342 100644 --- a/tests/Input/Android.bp +++ b/tests/Input/Android.bp @@ -13,6 +13,9 @@ android_test { "src/**/*.java", "src/**/*.kt", ], + kotlincflags: [ + "-Werror", + ], platform_apis: true, certificate: "platform", static_libs: [ diff --git a/tests/Input/src/com/android/test/input/AnrTest.kt b/tests/Input/src/com/android/test/input/AnrTest.kt index 1d65cc35c3bc..0246426c1d33 100644 --- a/tests/Input/src/com/android/test/input/AnrTest.kt +++ b/tests/Input/src/com/android/test/input/AnrTest.kt @@ -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 diff --git a/tests/Input/src/com/android/test/input/UnresponsiveGestureMonitorActivity.kt b/tests/Input/src/com/android/test/input/UnresponsiveGestureMonitorActivity.kt index d83a4570fedc..3a24406e2b73 100644 --- a/tests/Input/src/com/android/test/input/UnresponsiveGestureMonitorActivity.kt +++ b/tests/Input/src/com/android/test/input/UnresponsiveGestureMonitorActivity.kt @@ -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()) } |