diff options
author | 2022-06-24 11:36:41 -0700 | |
---|---|---|
committer | 2022-08-03 14:27:45 -0700 | |
commit | 64acfee25d5d38d92267238a7847cccfccd2e829 (patch) | |
tree | b0952cb8f9863f14c05c5b56e3670a5e11a4f3f7 | |
parent | 84ce5affa7161f765f6c1b7bceb52589930c3a12 (diff) |
Fix more kotlin 1.7.0 errors
Fix "'when' expression must be exhaustive" and UNEXPECTED_SAFE_CALL
errors.
Bug: 216136346
Test: m checkbuild
Change-Id: I2c1b1f7581426496f31198896c4ff3bd9abf2941
4 files changed, 5 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanelController.kt b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanelController.kt index 28ab83c83a42..d483241c4e9a 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanelController.kt +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanelController.kt @@ -429,6 +429,7 @@ class BackPanelController private constructor( stretchEntryBackIndicator(preThresholdStretchProgress(xTranslation)) GestureState.INACTIVE -> mView.resetStretch() + else -> {} } // set y translation diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/MediaResumeListenerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/MediaResumeListenerTest.kt index 3d3ac836d264..83168cb87dfe 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/MediaResumeListenerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/MediaResumeListenerTest.kt @@ -305,7 +305,7 @@ class MediaResumeListenerTest : SysuiTestCase() { // Then we save an update with the current time verify(sharedPrefsEditor).putString(any(), (capture(componentCaptor))) componentCaptor.value.split(ResumeMediaBrowser.DELIMITER.toRegex()) - ?.dropLastWhile { it.isEmpty() }.forEach { + .dropLastWhile { it.isEmpty() }.forEach { val result = it.split("/") assertThat(result.size).isEqualTo(3) assertThat(result[2].toLong()).isEqualTo(currentTime) @@ -392,7 +392,7 @@ class MediaResumeListenerTest : SysuiTestCase() { // Then we store the new lastPlayed time verify(sharedPrefsEditor).putString(any(), (capture(componentCaptor))) componentCaptor.value.split(ResumeMediaBrowser.DELIMITER.toRegex()) - ?.dropLastWhile { it.isEmpty() }.forEach { + .dropLastWhile { it.isEmpty() }.forEach { val result = it.split("/") assertThat(result.size).isEqualTo(3) assertThat(result[2].toLong()).isEqualTo(currentTime) diff --git a/services/tests/PackageManagerServiceTests/host/src/com/android/server/pm/test/SystemStubMultiUserDisableUninstallTest.kt b/services/tests/PackageManagerServiceTests/host/src/com/android/server/pm/test/SystemStubMultiUserDisableUninstallTest.kt index 45e0d09a1753..4ef6875dd310 100644 --- a/services/tests/PackageManagerServiceTests/host/src/com/android/server/pm/test/SystemStubMultiUserDisableUninstallTest.kt +++ b/services/tests/PackageManagerServiceTests/host/src/com/android/server/pm/test/SystemStubMultiUserDisableUninstallTest.kt @@ -628,6 +628,7 @@ class SystemStubMultiUserDisableUninstallTest : BaseHostJUnit4Test() { CodePath.SAME, CodePath.DIFFERENT -> throw AssertionError("secondDataPath cannot be a data path") CodePath.SYSTEM -> assertThat(codePaths[1]).isEqualTo(stubFile.parent.toString()) + else -> {} } } diff --git a/tools/xmlpersistence/src/main/kotlin/Generator.kt b/tools/xmlpersistence/src/main/kotlin/Generator.kt index b2c5f4ac767b..8e62388c860f 100644 --- a/tools/xmlpersistence/src/main/kotlin/Generator.kt +++ b/tools/xmlpersistence/src/main/kotlin/Generator.kt @@ -149,6 +149,7 @@ private val ClassFieldInfo.allClassFields: List<ClassFieldInfo> when (field) { is ClassFieldInfo -> this += field.allClassFields is ListFieldInfo -> this += field.element.allClassFields + else -> {} } } } |