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

Commit 61be7871 authored by Colin Cross's avatar Colin Cross Committed by Cherrypicker Worker
Browse files

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
(cherry picked from commit 64acfee2)
Merged-In: I2c1b1f7581426496f31198896c4ff3bd9abf2941
parent a06f1eba

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanelController.kt

+1 −0
Original line number Diff line number Diff line
@@ -417,6 +417,7 @@ class BackPanelController private constructor( 
                stretchEntryBackIndicator(preThresholdStretchProgress(xTranslation))

            GestureState.INACTIVE ->

                mView.resetStretch()

            else -> {}

        }



        // set y translation

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

+2 −2
Original line number Diff line number Diff line
@@ -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)

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

+1 −0
Original line number Diff line number Diff line
@@ -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 -> {}

        }

    }

tools/xmlpersistence/src/main/kotlin/Generator.kt

+1 −0
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ private val ClassFieldInfo.allClassFields: List<ClassFieldInfo> 
                when (field) {

                    is ClassFieldInfo -> this += field.allClassFields

                    is ListFieldInfo -> this += field.element.allClassFields

                    else -> {}

                }

            }

        }