Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2aed1f37 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Streamline activity start flow"

parents d3a69854 bde91e94

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

+399 −555

File changed.

Preview size limit exceeded, changes collapsed.

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

+7 −0
Original line number Diff line number Diff line
@@ -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

+1 −0
Original line number Diff line number Diff line
@@ -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();