From e7421e92d947b09ca3cb9e6dfb66bbb27b9ed114 Mon Sep 17 00:00:00 2001 From: "Philip P. Moltmann" Date: Mon, 10 Feb 2020 16:14:12 +0000 Subject: Revert "Activity start: Send featureId from context->AppOpsManager" Revert "Adjust monkey to changed internal APIs" Revert "Test featureId is correctly used in startActivity" Revert submission 10111030-activityStarter_featureId Reason for revert: presubmit test breakage Reverted Changes: Ic7056b492: Activity start: Send featureId from context->AppOp... I8e2a07da7: Adjust monkey to changed internal APIs I7a6af6fb1: Test featureId is correctly used in startActivity Change-Id: I48c55a962c990b22ea49e923baa7c73b121d179b --- .../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 c458d1190e51..661f32f35cb2 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.getFeatureId(), + context.getPackageName(), context.getPackageManager().getLaunchIntentForPackage(packageName), null, null, null, 0, 0, null, null, userId); attestTrue("User " + userId + " failed to start " + packageName, -- cgit v1.2.3