Merge "Streamline activity start flow"

services/core/java/com/android/server/wm/LockTaskController.java

@@ -279,6 +279,13 @@ public class LockTaskController {
         }
     }
 
+    /**
+     * @return true if currently in the lock task mode, otherwise, return false.
+     */
+    boolean isInLockTaskMode() {
+        return !mLockTaskModeTasks.isEmpty();
+    }
+
     /**
      * @return whether the requested task is disallowed to be launched.
      */

services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java

@@ -499,6 +499,7 @@ public class ActivityStarterTests extends ActivityTestsBase {
         final ActivityStarter starter = prepareStarter(0);
 
         final LockTaskController lockTaskController = mService.getLockTaskController();
+        doReturn(true).when(lockTaskController).isInLockTaskMode();
         doReturn(true).when(lockTaskController).isLockTaskModeViolation(any());
 
         final int result = starter.setReason("testTaskModeViolation").execute();