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

Commit 30aa4a19 authored by wilsonshih's avatar wilsonshih
Browse files

Fix SystemUI crash from back navigation trigger acquire wakelock. 

PowerManager throw permission exception because core didn't clear
calling identitiy when calling startBackNavigation.
OTH, setLaunchBehind shouldn't pause current resume activity, will
be addressed separately from this CL.

Bug: 300428312
Test: launch two activity at once, to make the first activity stay in
initialized stage. Then when trigger gesture back, SystemUI won't crash
from receive SecurityException.

Change-Id: I5b283d631f151925cdc8877677df433660a5047c
parent 35bfcec9

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

+6 −2
Original line number Diff line number Diff line
@@ -1841,8 +1841,12 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
            RemoteCallback navigationObserver, BackAnimationAdapter adapter) {

        mAmInternal.enforceCallingPermission(START_TASKS_FROM_RECENTS,

                "startBackNavigation()");



        final long origId = Binder.clearCallingIdentity();

        try {

            return mBackNavigationController.startBackNavigation(navigationObserver, adapter);

        } finally {

            Binder.restoreCallingIdentity(origId);

        }

    }



    /**