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

Commit 6b4da17b authored by Yasin Kilicdere's avatar Yasin Kilicdere
Browse files

Start test apks via adb command instead of calling the API directly. 

Calling the API was failing with ActivityManager.START_ABORTED error
code. This CL fixes that issue by starting the test apk via abd shell
command.

Bug: 279403644
Test: atest UserLifecycleTests
Change-Id: I86d0c0f8ccd0f17833ad418c29be19489a2fdc9f
parent 304ace56

apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java

+14 −10
Original line number Diff line number Diff line
@@ -24,11 +24,9 @@ import static org.junit.Assume.assumeTrue; 


import android.annotation.NonNull;

import android.app.ActivityManager;

import android.app.ActivityTaskManager;

import android.app.AppGlobals;

import android.app.IActivityManager;

import android.app.IStopUserCallback;

import android.app.WaitResult;

import android.app.WallpaperManager;

import android.content.BroadcastReceiver;

import android.content.Context;
@@ -1389,14 +1387,20 @@ public class UserLifecycleTests { 
     * Launches the given package in the given user.

     * Make sure the keyguard has been dismissed prior to calling.

     */

    private void startApp(int userId, String packageName) throws RemoteException {

        final Context context = InstrumentationRegistry.getContext();

        final WaitResult result = ActivityTaskManager.getService().startActivityAndWait(null,

                context.getPackageName(), context.getAttributionTag(),

                context.getPackageManager().getLaunchIntentForPackage(packageName), null, null,

                null, 0, 0, null, null, userId);

        attestTrue("User " + userId + " failed to start " + packageName,

                result.result == ActivityManager.START_SUCCESS);

    private void startApp(int userId, String packageName) {

        final String failMessage = "User " + userId + " failed to start " + packageName;

        final String component = InstrumentationRegistry.getContext().getPackageManager()

                .getLaunchIntentForPackage(packageName).getComponent().flattenToShortString();

        try {

            final String result = ShellHelper.runShellCommandWithTimeout(

                    "am start -W -n " + component + " --user " + userId, TIMEOUT_IN_SECOND);

            assertTrue(failMessage + ", component=" + component + ", result=" + result,

                    result.contains("Status: ok")

                    && !result.contains("Warning:")

                    && !result.contains("Error:"));

        } catch (TimeoutException e) {

            fail(failMessage + " in " + TIMEOUT_IN_SECOND + " seconds");

        }

    }



    private class ProgressWaiter extends IProgressListener.Stub {