From 211f74608a7316a3e08609511067b787593dfea6 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Wed, 18 Dec 2024 11:15:18 -0800 Subject: [PATCH] Some HSUM bug fixes Bug: 383952735 Bug: 384136644 Test: Presubmit Flag: EXEMPT bugfix Change-Id: I705d79d008100edd3fcf6fcac4524c204fd4ea30 --- .../src/com/android/quickstep/TaplPrivateSpaceTest.java | 6 ++++-- .../com/android/launcher3/pm/InstallSessionHelperTest.kt | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/quickstep/tests/src/com/android/quickstep/TaplPrivateSpaceTest.java b/quickstep/tests/src/com/android/quickstep/TaplPrivateSpaceTest.java index b15b78e305..e065dba592 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplPrivateSpaceTest.java +++ b/quickstep/tests/src/com/android/quickstep/TaplPrivateSpaceTest.java @@ -23,6 +23,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeFalse; +import android.os.Process; import android.util.Log; import androidx.test.ext.junit.runners.AndroidJUnit4; @@ -74,8 +75,9 @@ public class TaplPrivateSpaceTest extends AbstractQuickStepTest { } private void createAndStartPrivateProfileUser() { - String createUserOutput = executeShellCommand("pm create-user --profileOf 0 --user-type " - + "android.os.usertype.profile.PRIVATE " + PRIVATE_PROFILE_NAME); + int myUserId = Process.myUserHandle().getIdentifier(); + String createUserOutput = executeShellCommand("pm create-user --profileOf " + myUserId + + " --user-type android.os.usertype.profile.PRIVATE " + PRIVATE_PROFILE_NAME); updatePrivateProfileSetupSuccessful("pm create-user", createUserOutput); String[] tokens = createUserOutput.split("\\s+"); mProfileUserId = Integer.parseInt(tokens[tokens.length - 1]); diff --git a/tests/src/com/android/launcher3/pm/InstallSessionHelperTest.kt b/tests/src/com/android/launcher3/pm/InstallSessionHelperTest.kt index f381d4bb8a..94b2c7e4c0 100644 --- a/tests/src/com/android/launcher3/pm/InstallSessionHelperTest.kt +++ b/tests/src/com/android/launcher3/pm/InstallSessionHelperTest.kt @@ -104,7 +104,7 @@ class InstallSessionHelperTest { .thenReturn(listOf(expectedVerifiedSession)) // When val actualSession = - installSessionHelper.getActiveSessionInfo(UserHandle(0), expectedAppPackage) + installSessionHelper.getActiveSessionInfo(myUserHandle(), expectedAppPackage) // Then assertThat(actualSession).isEqualTo(expectedVerifiedSession) }