diff options
| author | 2024-11-25 13:14:38 +0000 | |
|---|---|---|
| committer | 2024-11-25 20:51:51 +0000 | |
| commit | 31ecf350869e5f10443e07b7478b24ce7c7ec945 (patch) | |
| tree | e24c7301c227cc7a7afdaebe87a08b68bc4abf75 | |
| parent | 3ebccb43a0a6fc3940e743cee0c8d457029f1511 (diff) | |
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
| -rw-r--r-- | packages/CarrierDefaultApp/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | packages/PackageInstaller/AndroidManifest.xml | 7 | ||||
| -rw-r--r-- | packages/VpnDialogs/AndroidManifest.xml | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/packages/CarrierDefaultApp/AndroidManifest.xml b/packages/CarrierDefaultApp/AndroidManifest.xml index 8f9730a9651b..6fdd73a37db5 100644 --- a/packages/CarrierDefaultApp/AndroidManifest.xml +++ b/packages/CarrierDefaultApp/AndroidManifest.xml @@ -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"> diff --git a/packages/PackageInstaller/AndroidManifest.xml b/packages/PackageInstaller/AndroidManifest.xml index 68443a7e1492..e029f3a16066 100644 --- a/packages/PackageInstaller/AndroidManifest.xml +++ b/packages/PackageInstaller/AndroidManifest.xml @@ -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" diff --git a/packages/VpnDialogs/AndroidManifest.xml b/packages/VpnDialogs/AndroidManifest.xml index ca4b5d4170c7..6ccfaf3e0b66 100644 --- a/packages/VpnDialogs/AndroidManifest.xml +++ b/packages/VpnDialogs/AndroidManifest.xml @@ -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> |