summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgopinath <gelanchezhian@google.com>2017-05-12 15:37:37 -0700
committerGopinath Elanchezhian <gelanchezhian@google.com>2017-06-14 00:06:01 +0000
commit0a2c9396a289be2b1d1447d949e3f5969204261a (patch)
treeecb4f299fff398056114ae57c0eaf6e0c4b45c1d
parentc041c7a34e77c22a00a504855ad13adff5ff508e (diff)
App launch test apk change
Support launching the app using the package name. Remove the unused variables. b/33226470 Change-Id: I5b3829912782a9fc0c8f09cbd6fa9ee4b5b35314 (cherry picked from commit a00259f47dc480f799a812a00f52e3c887aae4b0)
-rw-r--r--tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java b/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java
index 8a5fd4b61d49..272653f7fc66 100644
--- a/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java
+++ b/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java
@@ -111,7 +111,6 @@ public class AppLaunch extends InstrumentationTestCase {
private Map<String, Intent> mNameToIntent;
- private Map<String, String> mNameToProcess;
private List<LaunchOrder> mLaunchOrderList = new ArrayList<LaunchOrder>();
private Map<String, String> mNameToResultKey;
private Map<String, List<Long>> mNameToLaunchTime;
@@ -431,7 +430,6 @@ public class AppLaunch extends InstrumentationTestCase {
private void createMappings() {
mNameToIntent = new LinkedHashMap<String, Intent>();
- mNameToProcess = new LinkedHashMap<String, String>();
PackageManager pm = getInstrumentation().getContext()
.getPackageManager();
@@ -459,8 +457,9 @@ public class AppLaunch extends InstrumentationTestCase {
ri.activityInfo.name);
String appName = ri.loadLabel(pm).toString();
if (appName != null) {
+ // Support launching intent using package name or app name
+ mNameToIntent.put(ri.activityInfo.packageName, startIntent);
mNameToIntent.put(appName, startIntent);
- mNameToProcess.put(appName, ri.activityInfo.processName);
}
}
}