From e87923c2df457bfec3bd804f51315471291015cb Mon Sep 17 00:00:00 2001 From: Kevin Neas Date: Mon, 12 Mar 2018 17:36:23 -0700 Subject: [PATCH] Protecting against trying to launch apps that don't exist BUG: 74083361 Change-Id: Ia0750bcca2534e794a81f094d5c214af4011c0ce Test: Locally (cherry picked from commit cb45b97a539a6460af1ecb43ddc3bf574f8100a9) --- .../src/com/android/tests/applaunch/AppLaunch.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/AppLaunchWear/src/com/android/tests/applaunch/AppLaunch.java b/tests/AppLaunchWear/src/com/android/tests/applaunch/AppLaunch.java index 38c298c5e9ff6..d36d84e8f51d2 100644 --- a/tests/AppLaunchWear/src/com/android/tests/applaunch/AppLaunch.java +++ b/tests/AppLaunchWear/src/com/android/tests/applaunch/AppLaunch.java @@ -229,6 +229,9 @@ public class AppLaunch extends InstrumentationTestCase { setLaunchOrder(); for (LaunchOrder launch : mLaunchOrderList) { + if (mNameToIntent.get(launch.getApp()) == null) { + continue; + } dropCache(); String appPkgName = mNameToIntent.get(launch.getApp()) .getComponent().getPackageName();