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

Android.bp

@@ -33,6 +33,7 @@ messaging_java_defaults {
     soong_config_variables: {
         build_variant_eng: {
             optimize: {
+                keep_runtime_invisible_annotations: true,
                 proguard_flags_files: [
                     "proguard.flags",
                     "proguard-test.flags",
@@ -40,6 +41,7 @@ messaging_java_defaults {
             },
             conditions_default: {
                 optimize: {
+                    keep_runtime_invisible_annotations: true,
                     proguard_flags_files: [
                         "proguard.flags",
                         "proguard-release.flags",

OWNERS

@@ -1,4 +1,3 @@
 # Default code reviewers picked from top 3 or more developers.
 # Please update this list if you find better candidates.
 tomtaylor@google.com
-rtenneti@google.com

proguard.flags

@@ -15,20 +15,49 @@
 #
 # Keep enough data for stack traces
 -renamesourcefileattribute SourceFile
--keepattributes SourceFile,LineNumberTable,*Annotation*
+-keepattributes SourceFile,
+                LineNumberTable,
+                RuntimeVisibleAnnotations,
+                RuntimeVisibleParameterAnnotations,
+                RuntimeVisibleTypeAnnotations,
+                AnnotationDefault
 
 -keep class com.android.messaging.* { *; }
 -keep class com.android.messaging.*.* { *; }
 -keep class com.android.messaging.*.*.* { *; }
 
--keep public class * extends android.app.Activity
+# TODO(b/373579455): Evaluate if <init> needs to be kept.
--keep public class * extends android.app.Application
+-keep public class * extends android.app.Activity {
--keep public class * extends android.app.Service
+  void <init>();
--keep public class * extends android.content.BroadcastReceiver
+}
--keep public class * extends android.content.ContentProvider
+# TODO(b/373579455): Evaluate if <init> needs to be kept.
--keep public class * extends android.app.backup.BackupAgentHelper
+-keep public class * extends android.app.Application {
--keep public class * extends android.preference.Preference
+  void <init>();
--keep public class * extends androidx.fragment.app.Fragment
+}
+# TODO(b/373579455): Evaluate if <init> needs to be kept.
+-keep public class * extends android.app.Service {
+  void <init>();
+}
+# TODO(b/373579455): Evaluate if <init> needs to be kept.
+-keep public class * extends android.content.BroadcastReceiver {
+  void <init>();
+}
+# TODO(b/373579455): Evaluate if <init> needs to be kept.
+-keep public class * extends android.content.ContentProvider {
+  void <init>();
+}
+# TODO(b/373579455): Evaluate if <init> needs to be kept.
+-keep public class * extends android.app.backup.BackupAgentHelper {
+  void <init>();
+}
+# TODO(b/373579455): Evaluate if <init> needs to be kept.
+-keep public class * extends android.preference.Preference {
+  void <init>();
+}
+# TODO(b/373579455): Evaluate if <init> needs to be kept.
+-keep public class * extends androidx.fragment.app.Fragment {
+  void <init>();
+}
 -keep public class com.android.vcard.* { *; }
 
 -keep class androidx.collection.* { *; }