From 06fa2e010c028f53a4114c8565687c905812c1c2 Mon Sep 17 00:00:00 2001 From: Yurii Zubrytskyi Date: Mon, 6 Jan 2025 19:45:32 -0800 Subject: [res] Fix overlay perf test on HSUM HSUM may have a different user running the test, causing setEnabled() to fail to find it in SYSTEM user Fixes: 387254704 Flag: EXEMPT bugfix Test: atest Change-Id: I94848b1ad1eb3df5331f482143167fb6f1568469 --- .../perftests/core/src/android/app/OverlayManagerPerfTest.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/apct-tests/perftests/core/src/android/app/OverlayManagerPerfTest.java b/apct-tests/perftests/core/src/android/app/OverlayManagerPerfTest.java index a12121fd13f7..5d39ccc882a8 100644 --- a/apct-tests/perftests/core/src/android/app/OverlayManagerPerfTest.java +++ b/apct-tests/perftests/core/src/android/app/OverlayManagerPerfTest.java @@ -20,7 +20,6 @@ import static org.junit.Assert.assertTrue; import android.content.Context; import android.content.om.OverlayManager; -import android.os.UserHandle; import android.perftests.utils.BenchmarkState; import android.perftests.utils.PerfStatusReporter; import android.perftests.utils.TestPackageInstaller; @@ -127,7 +126,7 @@ public class OverlayManagerPerfTest { private void assertSetEnabled(boolean enabled, Context context, Stream packagesStream) { final var overlayPackages = packagesStream.toList(); overlayPackages.forEach( - name -> sOverlayManager.setEnabled(name, enabled, UserHandle.SYSTEM)); + name -> sOverlayManager.setEnabled(name, enabled, context.getUser())); // Wait for the overlay changes to propagate final var endTime = System.nanoTime() + TimeUnit.SECONDS.toNanos(20); @@ -174,7 +173,7 @@ public class OverlayManagerPerfTest { // Disable the overlay and remove the idmap for the next iteration of the test state.pauseTiming(); assertSetEnabled(false, sContext, packageName); - sOverlayManager.invalidateCachesForOverlay(packageName, UserHandle.SYSTEM); + sOverlayManager.invalidateCachesForOverlay(packageName, sContext.getUser()); state.resumeTiming(); } } @@ -189,7 +188,7 @@ public class OverlayManagerPerfTest { // Disable the overlay and remove the idmap for the next iteration of the test state.pauseTiming(); assertSetEnabled(false, sContext, packageName); - sOverlayManager.invalidateCachesForOverlay(packageName, UserHandle.SYSTEM); + sOverlayManager.invalidateCachesForOverlay(packageName, sContext.getUser()); state.resumeTiming(); } } -- cgit v1.2.3-59-g8ed1b