From f2528b8539c1ac80ed8f22863ecfd1a25564e19e Mon Sep 17 00:00:00 2001 From: Calin Juravle Date: Wed, 26 Sep 2018 14:09:44 -0700 Subject: [PATCH] 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 --- .../src/com/android/tests/applaunch/AppLaunch.java | 10 ++++++++-- 1 file 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 6ce66f0f45466..639ed7d553848 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));