diff options
| author | 2024-04-22 10:22:14 -0700 | |
|---|---|---|
| committer | 2024-04-22 10:22:14 -0700 | |
| commit | 4a5c468e7f9979be759cb267c7595ea5cf23d19c (patch) | |
| tree | d188cd3b7694ea2d4b8efc87fa5992240edd6d05 | |
| parent | 748f05324ae4feb26938dd21c694bda86378d84e (diff) | |
Keep the test helper process unfrozen during the test
Bug: 330463870
Test: atest ActivityManagerPerfTests:OomAdjPerfTest
Change-Id: Ieb60099a916a9412558f27683fb553447df495bd
3 files changed, 15 insertions, 0 deletions
diff --git a/tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/tests/OomAdjPerfTest.java b/tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/tests/OomAdjPerfTest.java index 5d6a4a3541c1..1c78e5bcb536 100644 --- a/tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/tests/OomAdjPerfTest.java +++ b/tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/tests/OomAdjPerfTest.java @@ -90,6 +90,9 @@ public final class OomAdjPerfTest extends BasePerfTest { TargetPackageUtils.startStubPackage(mContext, STUB_PACKAGE1_NAME); TargetPackageUtils.startStubPackage(mContext, STUB_PACKAGE2_NAME); TargetPackageUtils.startStubPackage(mContext, STUB_PACKAGE3_NAME); + + Utils.wakeUp(); + Utils.runShellCommand("wm dismiss-keyguard"); } @After diff --git a/tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/util/TargetPackageUtils.java b/tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/util/TargetPackageUtils.java index d7f4d9de6735..705fe296ae17 100644 --- a/tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/util/TargetPackageUtils.java +++ b/tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/util/TargetPackageUtils.java @@ -175,6 +175,7 @@ public class TargetPackageUtils { context.startService(intent); Assert.assertTrue("Timeout when waiting for starting package " + pkgName, pair.second.await(AWAIT_SERVICE_CONNECT_MS, TimeUnit.MILLISECONDS)); + Utils.runShellCommand("am unfreeze --sticky " + pkgName); } catch (InterruptedException e) { throw new RuntimeException(e); } diff --git a/tests/ActivityManagerPerfTests/utils/src/com/android/frameworks/perftests/am/util/Utils.java b/tests/ActivityManagerPerfTests/utils/src/com/android/frameworks/perftests/am/util/Utils.java index 9bd94f2a9a1e..421ae57deae3 100644 --- a/tests/ActivityManagerPerfTests/utils/src/com/android/frameworks/perftests/am/util/Utils.java +++ b/tests/ActivityManagerPerfTests/utils/src/com/android/frameworks/perftests/am/util/Utils.java @@ -66,4 +66,15 @@ public class Utils { ResultReceiver resultReceiver = intent.getParcelableExtra(Intent.EXTRA_RESULT_RECEIVER); resultReceiver.send(0, null); } + + /** + * Wake up the device. + */ + public static void wakeUp() { + try { + UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()).wakeUp(); + } catch (RemoteException e) { + throw new RuntimeException(e); + } + } } |