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

Merge "Fix more kotlin 1.7.0 errors" am: 78ef274d1b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2174648

Change-Id: I462db357e1fc22fec4e60d5edcfaab0e1bcf0ec2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Colin Cross
2022-09-01 22:46:08 +00:00
committed by Automerger Merge Worker
parent 1bfdac63f2 78ef274d1b
commit f06660f5f6
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/tests/src/com/android/systemui/media/MediaResumeListenerTest.kt
View File

@@ -305,7 +305,7 @@ class MediaResumeListenerTest : SysuiTestCase() {
// Then we save an update with the current time // Then we save an update with the current time
verify(sharedPrefsEditor).putString(any(), (capture(componentCaptor))) verify(sharedPrefsEditor).putString(any(), (capture(componentCaptor)))
componentCaptor.value.split(ResumeMediaBrowser.DELIMITER.toRegex()) componentCaptor.value.split(ResumeMediaBrowser.DELIMITER.toRegex())
?.dropLastWhile { it.isEmpty() }.forEach { .dropLastWhile { it.isEmpty() }.forEach {
val result = it.split("/") val result = it.split("/")
assertThat(result.size).isEqualTo(3) assertThat(result.size).isEqualTo(3)
assertThat(result[2].toLong()).isEqualTo(currentTime) assertThat(result[2].toLong()).isEqualTo(currentTime)
@@ -392,7 +392,7 @@ class MediaResumeListenerTest : SysuiTestCase() {
// Then we store the new lastPlayed time // Then we store the new lastPlayed time
verify(sharedPrefsEditor).putString(any(), (capture(componentCaptor))) verify(sharedPrefsEditor).putString(any(), (capture(componentCaptor)))
componentCaptor.value.split(ResumeMediaBrowser.DELIMITER.toRegex()) componentCaptor.value.split(ResumeMediaBrowser.DELIMITER.toRegex())
?.dropLastWhile { it.isEmpty() }.forEach { .dropLastWhile { it.isEmpty() }.forEach {
val result = it.split("/") val result = it.split("/")
assertThat(result.size).isEqualTo(3) assertThat(result.size).isEqualTo(3)
assertThat(result[2].toLong()).isEqualTo(currentTime) assertThat(result[2].toLong()).isEqualTo(currentTime)

1
services/tests/PackageManagerServiceTests/host/src/com/android/server/pm/test/SystemStubMultiUserDisableUninstallTest.kt
View File

@@ -628,6 +628,7 @@ class SystemStubMultiUserDisableUninstallTest : BaseHostJUnit4Test() {
CodePath.SAME, CodePath.DIFFERENT -> CodePath.SAME, CodePath.DIFFERENT ->
throw AssertionError("secondDataPath cannot be a data path") throw AssertionError("secondDataPath cannot be a data path")
CodePath.SYSTEM -> assertThat(codePaths[1]).isEqualTo(stubFile.parent.toString()) CodePath.SYSTEM -> assertThat(codePaths[1]).isEqualTo(stubFile.parent.toString())
else -> {}
} }
} }

1
tools/xmlpersistence/src/main/kotlin/Generator.kt
View File

@@ -149,6 +149,7 @@ private val ClassFieldInfo.allClassFields: List<ClassFieldInfo>
when (field) { when (field) {
is ClassFieldInfo -> this += field.allClassFields is ClassFieldInfo -> this += field.allClassFields
is ListFieldInfo -> this += field.element.allClassFields is ListFieldInfo -> this += field.element.allClassFields
else -> {}
} }
} }
} }