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

Commit 6172677d authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Fix SystemUI crash from back navigation trigger acquire wakelock." into main

parents 9a54b127 30aa4a19

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

+6 −2
Original line number Diff line number Diff line
@@ -1843,8 +1843,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);

        }

    }



    /**