Merge tag 'android-15.0.0_r32' of https://android.googlesource.com/platform/packages/services/Mms into HEAD

Android 15.0.0 Release 32 (BP1A.250505.005)

Change-Id: I0b5bfe9790fadee1ce017d1c990032ce8581aecc

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCaBqG7wAKCRDorT+BmrEO
# eCPRAJ92A23Bp8KXPvOFNpl+Of1vrrNlEQCfcE+YfLc/wIgangMnync5wkXDfI4=
# =nYnD
# -----END PGP SIGNATURE-----
# gpg: Signature faite le mar 06 mai 2025 18:02:23 EDT
# gpg:                avec la clef DSA 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Impossible de vérifier la signature : Pas de clef publique
diff --git a/src/com/android/mms/service/metrics/PersistMmsAtomsStorage.java b/src/com/android/mms/service/metrics/PersistMmsAtomsStorage.java
index 4e9ffc7..faf43d9 100644
--- a/src/com/android/mms/service/metrics/PersistMmsAtomsStorage.java
+++ b/src/com/android/mms/service/metrics/PersistMmsAtomsStorage.java
@@ -101,7 +101,7 @@
 
             // Start from scratch if build changes, since mixing atoms from different builds could
             // produce strange results.
-            if (!Build.FINGERPRINT.equals(atoms.getBuildFingerprint())) {
+            if (!String.valueOf(Build.TIME).equals(atoms.getBuildFingerprint())) {
                 Log.d(TAG, "[loadAtomsFromFile]: Build changed");
                 return makeNewPersistMmsAtoms();
             }
@@ -244,7 +244,7 @@
         // allow pulling only after some time so data are sufficiently aggregated.
         long currentTime = getWallTimeMillis();
         PersistMmsAtoms atoms = PersistMmsAtoms.newBuilder()
-                .setBuildFingerprint(Build.FINGERPRINT)
+                .setBuildFingerprint(String.valueOf(Build.TIME))
                 .setIncomingMmsPullTimestampMillis(currentTime)
                 .setOutgoingMmsPullTimestampMillis(currentTime)
                 .build();