Michael Bestas b57c41709d Merge tag 'android-16.0.0_r1' into lineage-23.0 ...

Android 16.0.0 release 1

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCaEhhFAAKCRDorT+BmrEO
# eLOdAKCHPJhTvoM0MAV2zS8sTjDG0Y4hwQCfckYdgli0zMEeKt+oxUJzQ0ORmNA=
# =f32s
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Jun 10 19:45:08 2025 EEST
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]

# By Christoffer Adamsen (2) and others
# Via Automerger Merge Worker (15) and others
* tag 'android-16.0.0_r1':
  [owners] Remove rtenneti@google.com from OWNERS
  packages/apps/Messaging: remove deprecated Mockito usages
  Do not keep runtime invisible annotations in proguard.flags
  Explicitly keep default constructor in rules without members
  Revert "Remove abandoned implementation."
  Remove abandoned implementation.

 Conflicts:
	proguard.flags
	tests/src/com/android/messaging/FakeFactory.java
	tests/src/com/android/messaging/datamodel/media/ImageRequestTest.java
	tests/src/com/android/messaging/ui/attachmentchooser/AttachmentChooserFragmentTest.java
	tests/src/com/android/messaging/ui/contact/ContactPickerFragmentTest.java
	tests/src/com/android/messaging/ui/conversation/ComposeMessageViewTest.java
	tests/src/com/android/messaging/ui/conversation/ConversationFragmentTest.java
	tests/src/com/android/messaging/ui/conversationlist/ConversationListFragmentTest.java
	tests/src/com/android/messaging/ui/mediapicker/AudioRecordViewTest.java
	tests/src/com/android/messaging/ui/mediapicker/GalleryGridItemViewTest.java
	tests/src/com/android/messaging/ui/mediapicker/MediaPickerTest.java

Change-Id: Ica660f1b6ac136254bc8e91ebee9469f30ebd7c1

2025-06-15 21:21:15 +03:00

3.0 KiB

Raw Blame History

View Raw