From 5f47c59103b73c8df8a5e09ff83ac51622c26d38 Mon Sep 17 00:00:00 2001 From: Robert Horvath Date: Wed, 24 Jul 2019 16:28:29 +0200 Subject: [PATCH] Pass callingPackage in UserLifecycleTest#startApp Calling IActivityTaskManager#startActivity requires the callingPackage to be set correctly as of ag/8668823, otherwise a SecurityException is thrown. Bug: 138095678 Test: Enable multi-user by declaring the "android.software.managed_users" feature and setting "config_multiuserMaximumUsers" to greather than 1. Then: `atest android.multiuser.UserLifecycleTests#managedProfileUnlockAndLaunchApp` Change-Id: Iab7cf0198a02a976ef5c54e4b87fb127aa7eac9a --- .../src/android/multiuser/UserLifecycleTests.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java b/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java index e2ef7a11b3a0b..2fe0ee7cab574 100644 --- a/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java +++ b/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java @@ -530,10 +530,10 @@ public class UserLifecycleTests { */ private void startApp(int userId, String packageName) throws RemoteException { final Context context = InstrumentationRegistry.getContext(); - final WaitResult result = ActivityTaskManager.getService().startActivityAndWait(null, null, - context.getPackageManager().getLaunchIntentForPackage(packageName), - null, null, null, 0, 0, null, null, - userId); + final WaitResult result = ActivityTaskManager.getService().startActivityAndWait(null, + context.getPackageName(), + context.getPackageManager().getLaunchIntentForPackage(packageName), null, null, + null, 0, 0, null, null, userId); attestTrue("User " + userId + " failed to start " + packageName, result.result == ActivityManager.START_SUCCESS); }