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

Commit 2e9054c5 authored by Priyanka Advani (xWF)'s avatar Priyanka Advani (xWF) Committed by Android (Google) Code Review
Browse files

Merge "Revert "Default enableOnBackInvokedCallback to true with targetSdk>=36"" into main

parents c272c4d9 51a1632e

core/java/com/android/internal/pm/pkg/parsing/ParsingPackageUtils.java

+1 −9
Original line number Diff line number Diff line
@@ -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