Revert "Default enableOnBackInvokedCallback to true with targetSdk>=36"

This reverts commit b3ee457f7d0b23bdcbecddb5e467240c877bc2db.

Reason for revert: <Potential culprit for b/379261150  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.>

Change-Id: Ie76788d591c47a80ec5b5b2acac3b46e56a5dcb1

1 files changed, 1 insertions, 9 deletions

diff --git a/core/java/com/android/internal/pm/pkg/parsing/ParsingPackageUtils.java b/core/java/com/android/internal/pm/pkg/parsing/ParsingPackageUtils.java
index 6db3c4dba0e6..8a6e6be1abbf 100644
--- a/core/java/com/android/internal/pm/pkg/parsing/ParsingPackageUtils.java
+++ b/core/java/com/android/internal/pm/pkg/parsing/ParsingPackageUtils.java
@@ -2377,7 +2377,6 @@ public class ParsingPackageUtils {
      * Flags are separated by type and by default value. They are sorted alphabetically within each
      * section.
      */
-    @SuppressWarnings("AndroidFrameworkCompatChange")
     private void parseBaseAppBasicFlags(ParsingPackage pkg, TypedArray sa) {
         int targetSdk = pkg.getTargetSdkVersion();
         //@formatter:off
@@ -2415,19 +2414,12 @@ public class ParsingPackageUtils {
                 .setResetEnabledSettingsOnAppDataCleared(bool(false,
                         R.styleable.AndroidManifestApplication_resetEnabledSettingsOnAppDataCleared,
                         sa))
+                .setOnBackInvokedCallbackEnabled(bool(false, R.styleable.AndroidManifestApplication_enableOnBackInvokedCallback, sa))
                 // targetSdkVersion gated
                 .setAllowAudioPlaybackCapture(bool(targetSdk >= Build.VERSION_CODES.Q, R.styleable.AndroidManifestApplication_allowAudioPlaybackCapture, sa))
                 .setHardwareAccelerated(bool(targetSdk >= Build.VERSION_CODES.ICE_CREAM_SANDWICH, R.styleable.AndroidManifestApplication_hardwareAccelerated, sa))
                 .setRequestLegacyExternalStorage(bool(targetSdk < Build.VERSION_CODES.Q, R.styleable.AndroidManifestApplication_requestLegacyExternalStorage, sa))
                 .setCleartextTrafficAllowed(bool(targetSdk < Build.VERSION_CODES.P, R.styleable.AndroidManifestApplication_usesCleartextTraffic, sa))
-                // CompatChange.isChangeEnabled() can't be used here because this is called during
-                // PackageManagerService initialization. PlatformCompat can't be used because this
-                // code is not guaranteed to be called from the system_server process. Therefore
-                // accessing Build.VERSION_CODES directly and suppressing
-                // AndroidFrameworkCompatChange warning
-                .setOnBackInvokedCallbackEnabled(bool(
-                        targetSdk > Build.VERSION_CODES.VANILLA_ICE_CREAM,
-                        R.styleable.AndroidManifestApplication_enableOnBackInvokedCallback, sa))
                 // Ints Default 0
                 .setUiOptions(anInt(R.styleable.AndroidManifestApplication_uiOptions, sa))
                 // Ints