Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit a851e2db authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-16.0.0_r1' into lineage-23.0

Android 16.0.0 release 1

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCaEhhFAAKCRDorT+BmrEO
# eI5qAJ0fKDZlgnawKoPMsmaLt8y5+A5vXQCffr1aq7///KzZYk5ZHwJKgBYOPVc=
# =F05G
# -----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 Owner Cleanup Bot (2) and others
# Via Automerger Merge Worker (6) and others
* tag 'android-16.0.0_r1':
  [owners] Remove paulye@google.com from OWNERS
  [owners] Remove hallliu@google.com from OWNERS
  Opt out of predictive back
  Explicitly keep default constructor in rules without members

 Conflicts:
       AndroidManifest.xml

Change-Id: I5547cefc2614119aa5324a9fbcc7beef6844965c
parents 602c630a e4e2f835
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -119,7 +119,8 @@
        android:icon="@mipmap/ic_launcher"
        android:label="@string/applicationLabel"
        android:supportsRtl="true"
        android:usesCleartextTraffic="false">
        android:usesCleartextTraffic="false"
        android:enableOnBackInvokedCallback="false">

        <activity
            android:name=".callstats.CallStatsDetailActivity"
+0 −2
Original line number Diff line number Diff line
@@ -4,6 +4,4 @@ twyen@google.com
zachh@google.com
linyuh@google.com
tgunn@google.com
hallliu@google.com
breadley@google.com
paulye@google.com
+8 −2
Original line number Diff line number Diff line
# Keep the annotation, classes, methods, and fields marked as UsedByReflection
-keep class com.android.dialer.proguard.UsedByReflection
-keep @com.android.dialer.proguard.UsedByReflection class *
# TODO(b/373579455): Evaluate if <init> needs to be kept.
-keep class com.android.dialer.proguard.UsedByReflection {
    void <init>();
}
# TODO(b/373579455): Evaluate if <init> needs to be kept.
-keep @com.android.dialer.proguard.UsedByReflection class * {
    void <init>();
}
-keepclassmembers class * {
    @com.android.dialer.proguard.UsedByReflection *;
}