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

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

Merge "Opt out of predictive back for activities with custom onBackPressed handling" into main

parents a6f309d9 31ecf350

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>