Remove EXTRA_USER_HANDLE from startSpaActivityForApp
Bug: 263553430
Test: Unit test
Change-Id: I6739d4518eac00cfe22905c1a6589b6e9f91a1d3
diff --git a/src/com/android/settings/spa/SpaActivity.kt b/src/com/android/settings/spa/SpaActivity.kt
index 41c71b0..55883c1 100644
--- a/src/com/android/settings/spa/SpaActivity.kt
+++ b/src/com/android/settings/spa/SpaActivity.kt
@@ -34,10 +34,7 @@
@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
}
}
diff --git a/tests/spa_unit/src/com/android/settings/spa/SpaActivityTest.kt b/tests/spa_unit/src/com/android/settings/spa/SpaActivityTest.kt
index 247f369..8a894d5 100644
--- a/tests/spa_unit/src/com/android/settings/spa/SpaActivityTest.kt
+++ b/tests/spa_unit/src/com/android/settings/spa/SpaActivityTest.kt
@@ -57,7 +57,6 @@
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 @@
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
}
}