Merge "Protecting against trying to launch apps that don't exist" into pi-dev

am: 9b8b54f9f6 Change-Id: I2dc8e043b9e6381085e3f066ac0705d106d54bac
2018-03-16 02:48:43 +00:00
parent 062f2c39f9 9b8b54f9f6
commit c5a792ae68
1 changed files with 3 additions and 0 deletions
--- 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();