| commit | 08f1f1f26df3c9f29bf48560b3c170801a3e9aea | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Fri Apr 06 09:44:49 2018 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Apr 06 09:44:49 2018 +0000 |
| tree | 57278114ea7f1365c59c4e3e9d7e7823a0e68e0c | |
| parent | 7def7be47eb5953f69a3dd504beb89e4c7236970 [diff] | |
| parent | 239b3f08489bac36583f1ba9297c47f6bdc1db43 [diff] |
Merge "Revert "Whitelist com.android.perftests.core in am instrument."" into pi-dev
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index adf3480..e0820e7 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -21901,8 +21901,6 @@ "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,