Merge tag 'android-14.0.0_r29' into staging/lineage-21.0_merge-android-14.0.0_r29
Android 14.0.0 release 29 # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZeZW4QAKCRDorT+BmrEO # eFdkAJ4k8Yv2uYj2CTc2SeOVkA5ohTtgEgCbB527BM9ma5p+RXTNbUWV5cM2jpg= # =HMBI # -----END PGP SIGNATURE----- # gpg: Signature made Tue Mar 5 01:18:57 2024 EET # gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78 # gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal] # gpg: initial-contribution@android.com: Verified 2353 signatures in the past # 2 years. Encrypted 4 messages in the past 2 years. # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 4340 D135 70EF 945E 8381 0964 E8AD 3F81 9AB1 0E78 # By Chaohui Wang (162) and others # Via Automerger Merge Worker (9630) and others * tag 'android-14.0.0_r29': (1187 commits) Forward developer settings intent to primary profile Add the config to show the pSIM conversion menu and set it to false Import translations. DO NOT MERGE ANYWHERE Import translations. DO NOT MERGE ANYWHERE Import translations. DO NOT MERGE ANYWHERE Fix broken PK setting page Import translations. DO NOT MERGE ANYWHERE Update media recommendation setting string Import translations. DO NOT MERGE ANYWHERE Revert "Disable multiuser toggle om COPE device and add explanat..." Fix Java crash problem Fix postsubmit test failures [Audiosharing] Move time consuming work to background. [PK Setting] add keyboard review under keyboard selection page Fix the isEmbeddedSubscriptionVisible logic Provide confirmation if creating new APN is not filled in enough and add a save button. Update USER_SETUP_COMPLETE setting after starting private space [Audiosharing] Set visibility by active device. [Audiosharing] Update the media device based on assistant callback Refine calibrator usage ... Conflicts: Android.bp res/xml/configure_notification_settings.xml res/xml/display_settings.xml res/xml/network_provider_internet.xml res/xml/power_usage_summary.xml res/xml/security_lockscreen_settings.xml src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java src/com/android/settings/datausage/AppDataUsage.java src/com/android/settings/datausage/DataSaverBackend.java src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java src/com/android/settings/network/NetworkProviderSettings.java src/com/android/settings/network/PrivateDnsModeDialogPreference.java src/com/android/settings/network/PrivateDnsPreferenceController.java src/com/android/settings/vpn2/ConfigDialog.java src/com/android/settings/wifi/WifiConfigController2.java tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java Change-Id: I607f65a6617dd6c31e5c45d4fb414d4c8745f33b
Loading
Please register or sign in to comment