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+BmrEOeAUCZeZW6QAKCRDorT+BmrEO # eLUrAJ9iIH74wLx82S/XNw08Mb5SxcvNhwCePTDbcxIKETkyPGcn+U1BvcMjE0k= # =mUgZ # -----END PGP SIGNATURE----- # gpg: Signature made Tue Mar 5 01:19:05 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 2357 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 Bill Yi (141) and others # Via Automerger Merge Worker (4835) and others * tag 'android-14.0.0_r29': (628 commits) Fix for Overlapping Time Text UI [Role Logic Move] Add migration logic for isRoleFallbackEnabled Fix for Swipe to Dismiss Animation Revert "Add permission listener tests for virtual devices" VibratorManager: Add check to testVibrator Remove left over string resources for wear Enforce non nullable to compile with kotlin rules Inline literal string value of Flags in API signature files Add permission listener tests for virtual devices Revert "Fix for Swipe to Dismiss Animation" Revert "Fix for Scroll Bar Visibility with RSB Scroll" Revert "Fix for Overlapping Time Text UI" Revert "Adding Androidx.wear_wear dependency" Fix for Overlapping Time Text UI Rename device aware permissions apis flag Fix for Scroll Bar Visibility with RSB Scroll Fix for Swipe to Dismiss Animation Adding Androidx.wear_wear dependency Add Privacy dashboard tests for Wear Show usage timestamps in WearPermissionApps ... Conflicts: PermissionController/role-controller/java/com/android/role/controller/behavior/CompanionDeviceAppStreamingRoleBehavior.java PermissionController/role-controller/java/com/android/role/controller/behavior/CompanionDeviceComputerRoleBehavior.java PermissionController/role-controller/java/com/android/role/controller/behavior/CompanionDeviceGlassesRoleBehavior.java PermissionController/role-controller/java/com/android/role/controller/behavior/CompanionDeviceWatchRoleBehavior.java PermissionController/src/com/android/permissioncontroller/permission/ui/model/v31/PermissionUsageControlPreferenceUtils.kt Change-Id: I343d2ec840b1ca01c5c5f42ce89b9537a0c71fd5
Loading
Please register or sign in to comment