commit b226f28a8c766630cdc5cd879d70a8a519100c2a
author Vadim Tryshev <vadimt@google.com> Mon Apr 22 22:58:32 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 22 22:58:32 2019 +0000
tree 8a3e72015e0bc6974fb42275f4139223379eb7b5
parent 67e52822a4338171cb0342ef2d3febbc969e6a5b
parent 12569122374c002895ea8f39da382cb894435c1b

Merge "Not using browser app in testing. It may not start." into ub-launcher3-qt-dev

quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java

diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
index 1709516..5e50a43 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
@@ -16,6 +16,8 @@
 
 package com.android.quickstep;
 
+import static com.android.launcher3.ui.TaplTestsLauncher3.getAppPackageName;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -60,7 +62,7 @@
     }
 
     private void startTestApps() throws Exception {
-        startAppFast(resolveSystemApp(Intent.CATEGORY_APP_BROWSER));
+        startAppFast(getAppPackageName());
         startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR));
         startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CONTACTS));
 

tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java

diff --git a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
index 5ab8d05..c55bc72 100644
--- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
+++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
@@ -370,7 +370,7 @@
                 launch(getAppPackageName());
     }
 
-    private static String getAppPackageName() {
+    public static String getAppPackageName() {
         return getInstrumentation().getContext().getPackageName();
     }
 }