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

Commit 4d98b3a3 authored by Guang Zhu's avatar Guang Zhu Committed by Android Git Automerger
Browse files

am 011caab6: Merge "freeze screen rotation during memory and app launch test" into lmp-dev 

* commit '011caab6fd12db45d314868f113bbc2ec38626d3':
  freeze screen rotation during memory and app launch test
parents 3bc02c24 4ed52ab7

tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java

+13 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.app.ActivityManager.ProcessErrorStateInfo; 
import android.app.ActivityManagerNative;

import android.app.IActivityManager;

import android.app.IActivityManager.WaitResult;

import android.app.UiAutomation;

import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;
@@ -72,6 +73,18 @@ public class AppLaunch extends InstrumentationTestCase { 
    private Bundle mResult = new Bundle();

    private Set<String> mRequiredAccounts;



    @Override

    protected void setUp() throws Exception {

        super.setUp();

        getInstrumentation().getUiAutomation().setRotation(UiAutomation.ROTATION_FREEZE_0);

    }



    @Override

    protected void tearDown() throws Exception {

        getInstrumentation().getUiAutomation().setRotation(UiAutomation.ROTATION_UNFREEZE);

        super.tearDown();

    }



    public void testMeasureStartUpTime() throws RemoteException, NameNotFoundException {

        InstrumentationTestRunner instrumentation =

                (InstrumentationTestRunner)getInstrumentation();

tests/MemoryUsage/src/com/android/tests/memoryusage/MemoryUsageTest.java

+13 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.app.ActivityManager.ProcessErrorStateInfo; 
import android.app.ActivityManager.RunningAppProcessInfo;

import android.app.ActivityManagerNative;

import android.app.IActivityManager;

import android.app.UiAutomation;

import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;
@@ -67,6 +68,18 @@ public class MemoryUsageTest extends InstrumentationTestCase { 
    private Set<String> mPersistentProcesses;

    private IActivityManager mAm;



    @Override

    protected void setUp() throws Exception {

        super.setUp();

        getInstrumentation().getUiAutomation().setRotation(UiAutomation.ROTATION_FREEZE_0);

    }



    @Override

    protected void tearDown() throws Exception {

        getInstrumentation().getUiAutomation().setRotation(UiAutomation.ROTATION_UNFREEZE);

        super.tearDown();

    }



    public void testMemory() {

        MemoryUsageInstrumentation instrumentation =

                (MemoryUsageInstrumentation) getInstrumentation();