Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b1843ea authored by Riddle Hsu's avatar Riddle Hsu
Browse files

Avoid unexpected screen off during perf testing 

The plugged-in type may be BATTERY_PLUGGED_AC in test environment.
And the precondition of the device may have set stay-on with any
type, then it is enough to keep device interactive. Previously
the usb type doesn't match the current state that causes device to
sleep if the screen off timeout has occurred.

Bug: 131727899
Test: atest WmPerfTests
Change-Id: Ia76a0f55e967a2d52fc4b1057b19a8af921260f3
parent 6dca4667

apct-tests/perftests/windowmanager/src/android/wm/RecentsAnimationPerfTest.java

+7 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentat 
import static org.hamcrest.core.AnyOf.anyOf;

import static org.hamcrest.core.AnyOf.anyOf;

import static org.hamcrest.core.Is.is;

import static org.hamcrest.core.Is.is;





import android.app.ActivityManager;

import android.app.ActivityManager.TaskSnapshot;

import android.app.ActivityManager.TaskSnapshot;

import android.app.ActivityTaskManager;

import android.app.ActivityTaskManager;

import android.app.IActivityTaskManager;

import android.app.IActivityTaskManager;
@@ -121,6 +122,12 @@ public class RecentsAnimationPerfTest extends WindowManagerPerfTestBase { 
    @AfterClass

    @AfterClass

    public static void tearDownClass() {

    public static void tearDownClass() {

        sSetUpClassException = null;

        sSetUpClassException = null;

        try {

            // Recents activity may stop app switches. Restore the state to avoid affecting

            // the next test.

            ActivityManager.resumeAppSwitches();

        } catch (RemoteException ignored) {

        }

        sUiAutomation.dropShellPermissionIdentity();

        sUiAutomation.dropShellPermissionIdentity();

    }

    }

apct-tests/perftests/windowmanager/src/android/wm/RelayoutPerfTest.java

+1 −4
Original line number Original line Diff line number Diff line
@@ -88,10 +88,7 @@ public class RelayoutPerfTest extends WindowManagerPerfTestBase { 
    public void testRelayout() throws Throwable {

    public void testRelayout() throws Throwable {

        final Activity activity = mActivityRule.getActivity();

        final Activity activity = mActivityRule.getActivity();

        final ContentView contentView = new ContentView(activity);

        final ContentView contentView = new ContentView(activity);

        mActivityRule.runOnUiThread(() -> {

        mActivityRule.runOnUiThread(() -> activity.setContentView(contentView));

            activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);

            activity.setContentView(contentView);

        });

        getInstrumentation().waitForIdleSync();

        getInstrumentation().waitForIdleSync();





        final RelayoutRunner relayoutRunner = new RelayoutRunner(activity, contentView.getWindow(),

        final RelayoutRunner relayoutRunner = new RelayoutRunner(activity, contentView.getWindow(),

apct-tests/perftests/windowmanager/src/android/wm/WindowManagerPerfTestBase.java

+17 −7
Original line number Original line Diff line number Diff line
@@ -19,11 +19,13 @@ package android.wm; 
import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;

import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;





import android.app.Activity;

import android.app.Activity;

import android.app.KeyguardManager;

import android.app.UiAutomation;

import android.app.UiAutomation;

import android.content.Context;

import android.content.Context;

import android.content.Intent;

import android.content.Intent;

import android.os.BatteryManager;

import android.os.BatteryManager;

import android.os.ParcelFileDescriptor;

import android.os.ParcelFileDescriptor;

import android.os.PowerManager;

import android.perftests.utils.PerfTestActivity;

import android.perftests.utils.PerfTestActivity;

import android.provider.Settings;

import android.provider.Settings;
@@ -61,25 +63,33 @@ public class WindowManagerPerfTestBase { 
    @BeforeClass

    @BeforeClass

    public static void setUpOnce() {

    public static void setUpOnce() {

        final Context context = getInstrumentation().getContext();

        final Context context = getInstrumentation().getContext();

        sOriginalStayOnWhilePluggedIn = Settings.Global.getInt(context.getContentResolver(),

        final int stayOnWhilePluggedIn = Settings.Global.getInt(context.getContentResolver(),

                Settings.Global.STAY_ON_WHILE_PLUGGED_IN, 0);

                Settings.Global.STAY_ON_WHILE_PLUGGED_IN, 0);

        sOriginalStayOnWhilePluggedIn = -1;

        if (stayOnWhilePluggedIn != BatteryManager.BATTERY_PLUGGED_ANY) {

            sOriginalStayOnWhilePluggedIn = stayOnWhilePluggedIn;

            // Keep the device awake during testing.

            // Keep the device awake during testing.

        setStayOnWhilePluggedIn(BatteryManager.BATTERY_PLUGGED_USB);

            setStayOnWhilePluggedIn(BatteryManager.BATTERY_PLUGGED_ANY);

        }





        if (!BASE_OUT_PATH.exists()) {

        if (!BASE_OUT_PATH.exists()) {

            executeShellCommand("mkdir -p " + BASE_OUT_PATH);

            executeShellCommand("mkdir -p " + BASE_OUT_PATH);

        }

        }

        // In order to be closer to the real use case.

        if (!context.getSystemService(PowerManager.class).isInteractive()

                || context.getSystemService(KeyguardManager.class).isKeyguardLocked()) {

            executeShellCommand("input keyevent KEYCODE_WAKEUP");

            executeShellCommand("input keyevent KEYCODE_WAKEUP");

            executeShellCommand("wm dismiss-keyguard");

            executeShellCommand("wm dismiss-keyguard");

        }

        context.startActivity(new Intent(Intent.ACTION_MAIN)

        context.startActivity(new Intent(Intent.ACTION_MAIN)

                .addCategory(Intent.CATEGORY_HOME).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));

                .addCategory(Intent.CATEGORY_HOME).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));

    }

    }





    @AfterClass

    @AfterClass

    public static void tearDownOnce() {

    public static void tearDownOnce() {

        if (sOriginalStayOnWhilePluggedIn != -1) {

            setStayOnWhilePluggedIn(sOriginalStayOnWhilePluggedIn);

            setStayOnWhilePluggedIn(sOriginalStayOnWhilePluggedIn);

        }

        }

    }





    private static void setStayOnWhilePluggedIn(int value) {

    private static void setStayOnWhilePluggedIn(int value) {

        executeShellCommand(String.format("settings put global %s %d",

        executeShellCommand(String.format("settings put global %s %d",