diff options
| author | 2018-03-23 17:34:19 +0000 | |
|---|---|---|
| committer | 2018-03-23 17:34:19 +0000 | |
| commit | 600f3bb4fb8dbf2566436e708ecf590b468072a7 (patch) | |
| tree | 244f46a2176940b61dc2bcafbad9e27a566099d2 | |
| parent | 95f2965a749ce81451217bf520b41b2c945ececb (diff) | |
| parent | 8bb4cfb7441f263a92dcd71d2c2c9923b0875862 (diff) | |
Merge "Whitelist com.android.perftests.core in am instrument." into pi-dev
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 457564b210b0..955035b272bd 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, |