From 77ccead37401152ebc8c947ba9adcbea3d360936 Mon Sep 17 00:00:00 2001 From: Yasin Kilicdere Date: Wed, 17 Aug 2022 13:48:42 +0100 Subject: [PATCH] Make switch user test measurements consistent with each other. In UserLifecycleTests switchUser and switchUser_running test methods wait for UserSwitchObserver.onUserSwitchComplete callback, whereas switchUser_stopped waits for ACTION_USER_UNLOCKED broadcast after triggering the user switch. Which makes the results incomparable and also shows switchUser_stopped is running faster than switchUser_running, but it makes more sense the other way around. This CL makes sure the tests wait for and measure the same thing to make the results comparable. Bug: 242843357 Test: atest MultiUserPerfTests:android.multiuser.UserLifecycleTests#switchUser_stopped --no-bazel-mode Change-Id: I250ceef1ae9ce0adec40972b7962932066121c4f --- .../multiuser/src/android/multiuser/UserLifecycleTests.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java b/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java index 448ee6160ce08..cd86d6a4d6c7c 100644 --- a/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java +++ b/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java @@ -273,9 +273,7 @@ public class UserLifecycleTests { mRunner.resumeTiming(); Log.i(TAG, "Starting timer"); - runThenWaitForBroadcasts(testUser, () -> { - mAm.switchUser(testUser); - }, Intent.ACTION_USER_UNLOCKED); + switchUser(testUser); mRunner.pauseTiming(); Log.i(TAG, "Stopping timer");