From 8bb4cfb7441f263a92dcd71d2c2c9923b0875862 Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Fri, 23 Mar 2018 15:00:50 +0000
Subject: [PATCH] Whitelist com.android.perftests.core in am instrument.

Test is using private APIs.

Bug: 64382372
Bug: 74963051
Bug: 76162083
Test: make
Change-Id: I053b89327944e3722f2c11a9bc83ed1676fa9f85
---
 .../core/java/com/android/server/am/ActivityManagerService.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 457564b210b08..955035b272bd0 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -21798,6 +21798,8 @@ public class ActivityManagerService extends IActivityManager.Stub
         "com.android.frameworks.locationtests",
         "com.android.frameworks.coretests.privacy",
         "com.android.settings.ui",
+        "com.android.perftests.core",
+        "com.android.perftests.multiuser",
     };
 
     public boolean startInstrumentation(ComponentName className,