diff options
| author | Gopinath Elanchezhian <gelanchezhian@google.com> | 2020-06-20 15:51:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-20 15:51:14 +0000 |
| commit | 3a0edac2bcdb7034ce9985d285c1acdce79c76b5 (patch) | |
| tree | 3a9f75a04cd806d9957c30fcd6def432a696965e | |
| parent | 8bb877aac70bdda231a92c4225cafae5eee634c2 (diff) | |
| parent | 3ed037cb4094e1fe287df7e7fc02808d946bf59f (diff) | |
Merge "Add collector library in multi user per test apk." into rvc-dev am: 3ed037cb40
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11886051
Change-Id: I2b052eb450d8c6434a9821b131108ec233a21a68
| -rw-r--r-- | apct-tests/perftests/multiuser/Android.bp | 1 | ||||
| -rw-r--r-- | apct-tests/perftests/multiuser/AndroidManifest.xml | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/apct-tests/perftests/multiuser/Android.bp b/apct-tests/perftests/multiuser/Android.bp index 508bf6007a9f..04432f25e337 100644 --- a/apct-tests/perftests/multiuser/Android.bp +++ b/apct-tests/perftests/multiuser/Android.bp @@ -17,6 +17,7 @@ android_test { srcs: ["src/**/*.java"], static_libs: [ "androidx.test.rules", + "collector-device-lib-platform", "apct-perftests-utils", ], platform_apis: true, diff --git a/apct-tests/perftests/multiuser/AndroidManifest.xml b/apct-tests/perftests/multiuser/AndroidManifest.xml index 893c8ca9328b..e4196dd6cf12 100644 --- a/apct-tests/perftests/multiuser/AndroidManifest.xml +++ b/apct-tests/perftests/multiuser/AndroidManifest.xml @@ -17,12 +17,16 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.perftests.multiuser"> + <uses-sdk android:targetSdkVersion="28" /> + <uses-permission android:name="android.permission.CONTROL_KEYGUARD" /> <uses-permission android:name="android.permission.MANAGE_USERS" /> <uses-permission android:name="android.permission.INSTALL_PACKAGES" /> <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" /> <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" /> <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" /> + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> + <uses-permission android:name="android.permission.REAL_GET_TASKS" /> <application> <uses-library android:name="android.test.runner" /> |