From 45d79db4d786dd74595bc49e33a31e0539fc53dd Mon Sep 17 00:00:00 2001
From: Fengjiang Li <fengjial@google.com>
Date: Mon, 23 Sep 2024 16:00:34 -0700
Subject: [PATCH] [Predictive Back] Enable predictive back in
 AndroidManifest.xml

Calling "getApplicationInfo().setEnableOnBackInvokedCallback(true)" is only suggested in tests.

Fix: 337985862
Flag: NONE - release feature fix
Test: manual
Change-Id: I336bdbe31c726b518d9342b1d39ef9e92f4dd498
---
 quickstep/AndroidManifest.xml                                 | 1 +
 .../com/android/launcher3/uioverrides/QuickstepLauncher.java  | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml
index bf198b605f..57bfb4acba 100644
--- a/quickstep/AndroidManifest.xml
+++ b/quickstep/AndroidManifest.xml
@@ -54,6 +54,7 @@
         android:protectionLevel="signature|privileged" />
 
     <application android:backupAgent="com.android.launcher3.LauncherBackupAgent"
+         android:enableOnBackInvokedCallback="true"
          android:fullBackupOnly="true"
          android:fullBackupContent="@xml/backupscheme"
          android:hardwareAccelerated="true"
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index 1f5cd3aa8e..2ea88e91ca 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -681,10 +681,6 @@ public class QuickstepLauncher extends Launcher implements RecentsViewContainer,
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        // Back dispatcher is registered in {@link BaseActivity#onCreate}. For predictive back to
-        // work, we must opt-in BEFORE registering back dispatcher. So we need to call
-        // setEnableOnBackInvokedCallback() before super.onCreate()
-        getApplicationInfo().setEnableOnBackInvokedCallback(true);
         super.onCreate(savedInstanceState);
         if (savedInstanceState != null) {
             mPendingSplitSelectInfo = ObjectWrapper.unwrap(