diff options
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); + } + } } |