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

Commit 0308f4f4 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12773175 from 2c478a02 to 25Q2-release 

Change-Id: Ib7f1c4a23579666a1a5c0603e12d9878cb002f7c
parents 73d08dee 2c478a02

boot/preloaded-classes

+1 −0
Original line number Diff line number Diff line
@@ -6469,6 +6469,7 @@ android.os.connectivity.WifiActivityEnergyInfo$1 
android.os.connectivity.WifiActivityEnergyInfo

android.os.connectivity.WifiBatteryStats$1

android.os.connectivity.WifiBatteryStats

android.os.flagging.AconfigPackage

android.os.health.HealthKeys$Constant

android.os.health.HealthKeys$Constants

android.os.health.HealthKeys$SortedIntArray

config/preloaded-classes

+1 −0
Original line number Diff line number Diff line
@@ -6473,6 +6473,7 @@ android.os.connectivity.WifiActivityEnergyInfo$1 
android.os.connectivity.WifiActivityEnergyInfo

android.os.connectivity.WifiBatteryStats$1

android.os.connectivity.WifiBatteryStats

android.os.flagging.AconfigPackage

android.os.health.HealthKeys$Constant

android.os.health.HealthKeys$Constants

android.os.health.HealthKeys$SortedIntArray

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -29956,7 +29956,7 @@ package android.net.http { 
  public class X509TrustManagerExtensions {

    ctor public X509TrustManagerExtensions(javax.net.ssl.X509TrustManager) throws java.lang.IllegalArgumentException;

    method public java.util.List<java.security.cert.X509Certificate> checkServerTrusted(java.security.cert.X509Certificate[], String, String) throws java.security.cert.CertificateException;

    method @FlaggedApi("android.net.platform.flags.x509_extensions_certificate_transparency") @NonNull public java.util.List<java.security.cert.X509Certificate> checkServerTrusted(@NonNull java.security.cert.X509Certificate[], @Nullable byte[], @Nullable byte[], @NonNull String, @NonNull String) throws java.security.cert.CertificateException;

    method @FlaggedApi("android.security.certificate_transparency_configuration") @NonNull public java.util.List<java.security.cert.X509Certificate> checkServerTrusted(@NonNull java.security.cert.X509Certificate[], @Nullable byte[], @Nullable byte[], @NonNull String, @NonNull String) throws java.security.cert.CertificateException;

    method public boolean isSameTrustConfiguration(String, String);

    method public boolean isUserAddedCertificate(java.security.cert.X509Certificate);

  }

core/java/android/content/EventLogTags.logtags

+1 −1
Original line number Diff line number Diff line 
# See system/core/logcat/event.logtags for a description of the format of this file.

# See system/logging/logcat/event.logtags for a description of the format of this file.



option java_package android.content;

core/java/android/content/res/flags.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -114,3 +114,11 @@ flag { 
    bug: "373535266"

    is_fixed_read_only: true

}



flag {

    name: "self_targeting_android_resource_frro"

    is_exported: true

    namespace: "customization_picker"

    description: "Fixes bug in Launcher preview by enabling overlays targeting 'android'"

    bug: "377545987"

}
 
 No newline at end of file