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

Commit afeb7496 authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Remove EXTRA_USER_HANDLE from startSpaActivityForApp

Bug: 263553430
Test: Unit test
Change-Id: I6739d4518eac00cfe22905c1a6589b6e9f91a1d3
parent e4f2fb56
Loading
Loading
Loading
Loading
+1 −4
Original line number Diff line number Diff line
@@ -34,10 +34,7 @@ class SpaActivity : BrowseActivity() {
        @JvmStatic
        fun Context.startSpaActivityForApp(destinationPrefix: String, intent: Intent): Boolean {
            val packageName = intent.data?.schemeSpecificPart ?: return false
            val userId = intent.getParcelableExtra(Intent.EXTRA_USER_HANDLE, UserHandle::class.java)
                ?.identifier
                ?: UserHandle.myUserId()
            startSpaActivity("$destinationPrefix/$packageName/$userId")
            startSpaActivity("$destinationPrefix/$packageName/${UserHandle.myUserId()}")
            return true
        }
    }
+1 −3
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ class SpaActivityTest {
    fun startSpaActivityForApp() {
        val intent = Intent().apply {
            data = Uri.parse("package:$PACKAGE_NAME")
            putExtra(Intent.EXTRA_USER_HANDLE, UserHandle.of(USER_ID))
        }

        context.startSpaActivityForApp(DESTINATION, intent)
@@ -67,12 +66,11 @@ class SpaActivityTest {
        val capturedIntent = intentCaptor.value
        assertThat(capturedIntent.component?.className).isEqualTo(SpaActivity::class.qualifiedName)
        assertThat(capturedIntent.getStringExtra(KEY_DESTINATION))
            .isEqualTo("Destination/package.name/1")
            .isEqualTo("Destination/package.name/${UserHandle.myUserId()}")
    }

    private companion object {
        const val DESTINATION = "Destination"
        const val PACKAGE_NAME = "package.name"
        const val USER_ID = 1
    }
}