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

Commit 9538d070 authored by Shan Huang's avatar Shan Huang
Browse files

Return compat callback for apps requesting legacy back. 

We don't need to check the enableOnBackInvokedCallback attribute value
because client side framework code will register the correct callback.

All apps need either the compat callback or default closing callback to
close.

Test: Swipe back on apps requesting legacy back. Then again on apps
using new back.
Test: atest frameworks/base/services/tests/wmtests/src/com/android/server/wm/BackNavigationControllerTests.java
Bug: 219850675

Change-Id: I57086febaf15d6ab04ab668a9a84623f4231c22f
parent 48045245

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

+0 −6
Original line number Diff line number Diff line
@@ -106,12 +106,6 @@ class BackNavigationController { 
        synchronized (task.mWmService.mGlobalLock) {

            activityRecord = task.topRunningActivity();



            if(!activityRecord.info.applicationInfo.isOnBackInvokedCallbackEnabled()) {

                ProtoLog.d(WM_DEBUG_BACK_PREVIEW, "Activity %s: enableOnBackInvokedCallback=false."

                        + " Returning null BackNavigationInfo.", activityRecord.getName());

                return null;

            }



            removedWindowContainer = activityRecord;

            taskWindowConfiguration = task.getTaskInfo().configuration.windowConfiguration;

            WindowState window = task.getWindow(WindowState::isFocused);