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

Commit 5d5470fa authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Android (Google) Code Review
Browse files

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

parents 5c5d2391 badc0a4b

core/java/android/window/flags/windowing_frontend.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -441,3 +441,11 @@ flag { 
    description: "Enable Predictive Back Animation for 3-button-nav"

    bug: "373544911"

}



flag {

    name: "predictive_back_default_enable_sdk_36"

    namespace: "systemui"

    description: "Enable Predictive Back by default with targetSdk>=36"

    is_fixed_read_only: true

    bug: "376407910"

}

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

+10 −1
Original line number Diff line number Diff line
@@ -2377,6 +2377,7 @@ 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
@@ -2414,12 +2415,20 @@ 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(

                        com.android.window.flags.Flags.predictiveBackDefaultEnableSdk36()

                            && targetSdk > Build.VERSION_CODES.VANILLA_ICE_CREAM,

                        R.styleable.AndroidManifestApplication_enableOnBackInvokedCallback, sa))

                // Ints Default 0

                .setUiOptions(anInt(R.styleable.AndroidManifestApplication_uiOptions, sa))

                // Ints