Merge "Modify PackageManagerPerfTest to work by itself agian" into rvc-dev am: aa3a470151 am: d8d4d09bf8

Change-Id: I1e83b616a66ce3e18c3e7eb1f25fe5493ce4fbb9
This commit is contained in:
Automerger Merge Worker
2020-03-04 19:29:37 +00:00

View File

@@ -43,9 +43,8 @@ public class PackageManagerPerfTest {
"com.android.perftests.packagemanager.TestPermission"; "com.android.perftests.packagemanager.TestPermission";
private static final String PERMISSION_NAME_DOESNT_EXIST = private static final String PERMISSION_NAME_DOESNT_EXIST =
"com.android.perftests.packagemanager.TestBadPermission"; "com.android.perftests.packagemanager.TestBadPermission";
private static final String OTHER_PACKAGE_NAME = "com.android.perftests.appenumeration0";
private static final ComponentName TEST_ACTIVITY = private static final ComponentName TEST_ACTIVITY =
new ComponentName(OTHER_PACKAGE_NAME, new ComponentName("com.android.perftests.packagemanager",
"android.perftests.utils.PerfTestActivity"); "android.perftests.utils.PerfTestActivity");
@Rule @Rule
@@ -130,7 +129,7 @@ public class PackageManagerPerfTest {
InstrumentationRegistry.getInstrumentation().getTargetContext().getPackageManager(); InstrumentationRegistry.getInstrumentation().getTargetContext().getPackageManager();
while (state.keepRunning()) { while (state.keepRunning()) {
pm.getPackageInfo(OTHER_PACKAGE_NAME, 0); pm.getPackageInfo(TEST_ACTIVITY.getPackageName(), 0);
} }
} }
@@ -148,7 +147,7 @@ public class PackageManagerPerfTest {
InstrumentationRegistry.getInstrumentation().getTargetContext().getPackageManager(); InstrumentationRegistry.getInstrumentation().getTargetContext().getPackageManager();
while (state.keepRunning()) { while (state.keepRunning()) {
pm.getApplicationInfo(OTHER_PACKAGE_NAME, 0); pm.getApplicationInfo(TEST_ACTIVITY.getPackageName(), 0);
} }
} }