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

2018-03-16 01:07:09 +00:00
parent a2ab56a425 e87923c2df
commit 9b8b54f9f6
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();