summaryrefslogtreecommitdiff
path: root/apct-tests/perftests
diff options
context:
space:
mode:
authorPhilip P. Moltmann <moltmann@google.com>2020-02-10 16:31:33 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-02-10 16:31:33 +0000
commit41308eced121d8b2b7e78d08edc8e0d4e9e43661 (patch)
tree877fbe3d571c4e48601e7a0dc5a9eef1fb7b0ea2 /apct-tests/perftests
parentca53165d6e5cf12b63d1ac8a67fcc6f45875d442 (diff)
parente7421e92d947b09ca3cb9e6dfb66bbb27b9ed114 (diff)
Merge "Revert "Activity start: Send featureId from context->AppOpsManager""
Diffstat (limited to 'apct-tests/perftests')
-rw-r--r--apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java2
1 files changed, 1 insertions, 1 deletions
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,