Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2023-03-16 15:54:31 +00:00
committed by Android (Google) Code Review
parent e801ab5633 0f5d9f6309
commit bcdfa159c9
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/Input/Android.bp
View File

@@ -13,6 +13,9 @@ android_test {
"src/**/*.java", "src/**/*.java",
"src/**/*.kt", "src/**/*.kt",
], ],
kotlincflags: [
"-Werror",
],
platform_apis: true, platform_apis: true,
certificate: "platform", certificate: "platform",
static_libs: [ static_libs: [

2
tests/Input/src/com/android/test/input/AnrTest.kt
View File

@@ -73,7 +73,7 @@ class AnrTest {
val contentResolver = instrumentation.targetContext.contentResolver val contentResolver = instrumentation.targetContext.contentResolver
hideErrorDialogs = Settings.Global.getInt(contentResolver, HIDE_ERROR_DIALOGS, 0) hideErrorDialogs = Settings.Global.getInt(contentResolver, HIDE_ERROR_DIALOGS, 0)
Settings.Global.putInt(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 @After

3
tests/Input/src/com/android/test/input/UnresponsiveGestureMonitorActivity.kt
View File

@@ -45,7 +45,8 @@ class UnresponsiveGestureMonitorActivity : Activity() {
private lateinit var mInputMonitor: InputMonitor private lateinit var mInputMonitor: InputMonitor
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
mInputMonitor = InputManager.getInstance().monitorGestureInput(MONITOR_NAME, displayId) val inputManager = getSystemService(InputManager::class.java)
mInputMonitor = inputManager.monitorGestureInput(MONITOR_NAME, displayId)
mInputEventReceiver = UnresponsiveReceiver( mInputEventReceiver = UnresponsiveReceiver(
mInputMonitor.getInputChannel(), Looper.myLooper()) mInputMonitor.getInputChannel(), Looper.myLooper())
} }