summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCalin Juravle <calin@google.com>2018-09-26 14:09:44 -0700
committerCalin Juravle <calin@google.com>2018-09-26 14:17:27 -0700
commitf2528b8539c1ac80ed8f22863ecfd1a25564e19e (patch)
treeb128bb6abab8397f00986357cddf4dd5e86e3a75
parent4a2dd10d834529311bf0daa4d5fa7c81f903bf61 (diff)
Fix trial run in AppLaunch test
If the app does not exist log an error but do not fail the test. Test: atest google/test/performance/app-install-startup -v (cherry-picked from commit 55db8ff9a6fa383134142f65d0b1d0da9957411d) Merged-In: Idb6f1d0ba3c5bfb6c7985cd84f5aa4e0599c6b59 Change-Id: Idb6f1d0ba3c5bfb6c7985cd84f5aa4e0599c6b59
-rw-r--r--tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java b/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java
index 6ce66f0f4546..639ed7d55384 100644
--- a/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java
+++ b/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java
@@ -245,8 +245,14 @@ public class AppLaunch extends InstrumentationTestCase {
mIterationCycle = false;
// In the "applaunch.txt" file, trail launches is referenced using
// "TRIAL_LAUNCH"
- String appPkgName = mNameToIntent.get(launch.getApp())
- .getComponent().getPackageName();
+ Intent startIntent = mNameToIntent.get(launch.getApp());
+ if (startIntent == null) {
+ Log.w(TAG, "App does not exist: " + launch.getApp());
+ mResult.putString(mNameToResultKey.get(launch.getApp()),
+ "App does not exist");
+ continue;
+ }
+ String appPkgName = startIntent.getComponent().getPackageName();
if (SPEED_PROFILE_FILTER.equals(launch.getCompilerFilter())) {
assertTrue(String.format("Not able to compile the app : %s", appPkgName),
compileApp(VERIFY_FILTER, appPkgName));