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

Commit 31ecf350 authored by Johannes Gallmann's avatar Johannes Gallmann
Browse files

Opt out of predictive back for activities with custom onBackPressed handling 

This CL ensures that some framework activities with custom back handling (onBackPressed overridden) remain opted-out of predictive back.

Predictive back will be enabled by default starting with Android B (and targetSDK>=36).

Bug: 376407910
Test: presubmit
Flag: com.android.window.flags.predictive_back_default_enable_sdk_36
Change-Id: Idb0a2446919bbfb80fcb895772cdff648211066c
parent 3ebccb43

packages/CarrierDefaultApp/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
            android:name="com.android.carrierdefaultapp.CaptivePortalLoginActivity"

            android:label="@string/action_bar_label"

            android:exported="true"

            android:enableOnBackInvokedCallback="false"

            android:permission="android.permission.MODIFY_PHONE_STATE"

            android:theme="@style/AppTheme"

            android:configChanges="keyboardHidden|orientation|screenSize">

packages/PackageInstaller/AndroidManifest.xml

+5 −2
Original line number Diff line number Diff line
@@ -81,10 +81,12 @@ 
            android:exported="false" />



        <activity android:name=".PackageInstallerActivity"

                android:exported="false" />

                android:exported="false"

                android:enableOnBackInvokedCallback="false" />



        <activity android:name=".InstallInstalling"

                android:exported="false" />

                android:exported="false"

                android:enableOnBackInvokedCallback="false" />



        <receiver android:name=".common.InstallEventReceiver"

                android:permission="android.permission.INSTALL_PACKAGES"
@@ -138,6 +140,7 @@ 


        <activity android:name=".UninstallUninstalling"

            android:excludeFromRecents="true"

            android:enableOnBackInvokedCallback="false"

            android:exported="false" />



        <receiver android:name=".UninstallFinish"

packages/VpnDialogs/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
        <activity android:name=".PlatformVpnConfirmDialog"

                  android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight"

                  android:noHistory="true"

                  android:enableOnBackInvokedCallback="false"

                  android:excludeFromRecents="true"

                  android:exported="true">

        </activity>