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

Commit 9d25b568 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Avoid app pinning requests if the Task is already locked" into sc-dev... 

Merge "Avoid app pinning requests if the Task is already locked" into sc-dev am: 92e535ff am: 8eb41edd

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/31095990



Change-Id: Ic9a92027402b6f3ffd0d8969b0808f4ff36f749c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b84db1ab 8eb41edd

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

+4 −0
Original line number Diff line number Diff line
@@ -621,6 +621,10 @@ public class LockTaskController { 
        if (!isSystemCaller) {

            task.mLockTaskUid = callingUid;

            if (task.mLockTaskAuth == LOCK_TASK_AUTH_PINNABLE) {

                if (mLockTaskModeTasks.contains(task)) {

                    Slog.i(TAG_LOCKTASK, "Already locked.");

                    return;

                }

                // startLockTask() called by app, but app is not part of lock task allowlist. Show

                // app pinning request. We will come back here with isSystemCaller true.

                ProtoLog.w(WM_DEBUG_LOCKTASK, "Mode default, asking user");

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

+5 −0
Original line number Diff line number Diff line
@@ -238,6 +238,11 @@ public class LockTaskControllerTest { 
        verifyLockTaskStarted(STATUS_BAR_MASK_PINNED, DISABLE2_NONE);

        // THEN screen pinning toast should be shown

        verify(mStatusBarService).showPinningEnterExitToast(eq(true /* entering */));



        // WHEN the app calls startLockTaskMode while the Task is already locked

        mLockTaskController.startLockTaskMode(tr, false, TEST_UID);

        // THEN a pinning request should NOT be shown

        verify(mStatusBarManagerInternal, never()).showScreenPinningRequest(anyInt());

    }



    @Test