PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove EXTRA_USER_HANDLE from startSpaActivityForApp"

Browse Source
This commit is contained in:
Chaohui Wang
2023-01-05 11:06:08 +00:00
committed by Android (Google) Code Review
parent 875cbba0af afeb7496bb
commit 4525cfb462
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/spa/SpaActivity.kt
View File

@@ -34,10 +34,7 @@ class SpaActivity : BrowseActivity() {
@JvmStatic @JvmStatic
fun Context.startSpaActivityForApp(destinationPrefix: String, intent: Intent): Boolean { fun Context.startSpaActivityForApp(destinationPrefix: String, intent: Intent): Boolean {
val packageName = intent.data?.schemeSpecificPart ?: return false val packageName = intent.data?.schemeSpecificPart ?: return false
val userId = intent.getParcelableExtra(Intent.EXTRA_USER_HANDLE, UserHandle::class.java) startSpaActivity("$destinationPrefix/$packageName/${UserHandle.myUserId()}")
?.identifier
?: UserHandle.myUserId()
startSpaActivity("$destinationPrefix/$packageName/$userId")
return true return true
} }
} }

4
tests/spa_unit/src/com/android/settings/spa/SpaActivityTest.kt
View File

@@ -57,7 +57,6 @@ class SpaActivityTest {
fun startSpaActivityForApp() { fun startSpaActivityForApp() {
val intent = Intent().apply { val intent = Intent().apply {
data = Uri.parse("package:$PACKAGE_NAME") data = Uri.parse("package:$PACKAGE_NAME")
putExtra(Intent.EXTRA_USER_HANDLE, UserHandle.of(USER_ID))
} }
context.startSpaActivityForApp(DESTINATION, intent) context.startSpaActivityForApp(DESTINATION, intent)
@@ -67,12 +66,11 @@ class SpaActivityTest {
val capturedIntent = intentCaptor.value val capturedIntent = intentCaptor.value
assertThat(capturedIntent.component?.className).isEqualTo(SpaActivity::class.qualifiedName) assertThat(capturedIntent.component?.className).isEqualTo(SpaActivity::class.qualifiedName)
assertThat(capturedIntent.getStringExtra(KEY_DESTINATION)) assertThat(capturedIntent.getStringExtra(KEY_DESTINATION))
.isEqualTo("Destination/package.name/1") .isEqualTo("Destination/package.name/${UserHandle.myUserId()}")
} }
private companion object { private companion object {
const val DESTINATION = "Destination" const val DESTINATION = "Destination"
const val PACKAGE_NAME = "package.name" const val PACKAGE_NAME = "package.name"
const val USER_ID = 1
} }
} }