From ee29509ecd73c3910011b2bdc12d1ef28fcb5a3d Mon Sep 17 00:00:00 2001 From: "Philip P. Moltmann" Date: Mon, 10 Feb 2020 08:46:26 -0800 Subject: Revert "Revert "Activity start: Send featureId from context->AppOpsManager"" This reverts commit e7421e92d947b09ca3cb9e6dfb66bbb27b9ed114. Exempt-From-Owner-Approval: revert-revert and only piping anyway Test: 1:1 revert-revert Bug: 136595429 Change-Id: I44e5fa2019f5604c6e2c08bdd1967129c64a90a7 --- .../perftests/multiuser/src/android/multiuser/UserLifecycleTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apct-tests') diff --git a/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java b/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java index 661f32f35cb2..c458d1190e51 100644 --- a/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java +++ b/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java @@ -670,7 +670,7 @@ public class UserLifecycleTests { private void startApp(int userId, String packageName) throws RemoteException { final Context context = InstrumentationRegistry.getContext(); final WaitResult result = ActivityTaskManager.getService().startActivityAndWait(null, - context.getPackageName(), + context.getPackageName(), context.getFeatureId(), context.getPackageManager().getLaunchIntentForPackage(packageName), null, null, null, 0, 0, null, null, userId); attestTrue("User " + userId + " failed to start " + packageName, -- cgit v1.2.3