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

Commit f20b5963 authored by Winson Chung's avatar Winson Chung
Browse files

Disable PiP when a task is locked. 

Bug: 37135610
Test: Start PiP, enable screen pinning, ensure that PiP is dismissed.
Change-Id: Ie5165364db891b13dd4ef282089f915fe9f99615
parent 7aab0c1b

services/core/java/com/android/server/am/ActivityManagerService.java

+7 −0
Original line number Diff line number Diff line
@@ -10685,6 +10685,13 @@ public class ActivityManagerService extends IActivityManager.Stub 
            return;

        }













        // When a task is locked, dismiss the pinned stack if it exists













        final PinnedActivityStack pinnedStack = mStackSupervisor.getStack(













                PINNED_STACK_ID);













        if (pinnedStack != null) {













            mStackSupervisor.removeStackLocked(PINNED_STACK_ID);













        }



























        // isSystemInitiated is used to distinguish between locked and pinned mode, as pinned mode















        // is initiated by system after the pinning request was shown and locked mode is initiated















        // by an authorized app directly