Merge tag 'android-15.0.0_r32' of https://android.googlesource.com/platform/frameworks/opt/telephony into HEAD
Android 15.0.0 Release 32 (BP1A.250505.005)
Change-Id: I5fa8fefec97255eedbdb391053df948c51b7a5d3
# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCaBqG7gAKCRDorT+BmrEO
# eLCZAJ4mWmZQOhu11/0Pwv6ShBFZnMd/1gCdHMdluo+u5OnsSY2FcTTy+TV/EaU=
# =N2Tk
# -----END PGP SIGNATURE-----
# gpg: Signature faite le mar 06 mai 2025 18:02:22 EDT
# gpg: avec la clef DSA 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Impossible de vérifier la signature : Pas de clef publique
diff --git a/src/java/com/android/internal/telephony/metrics/PersistAtomsStorage.java b/src/java/com/android/internal/telephony/metrics/PersistAtomsStorage.java
index 581d54c..2ddc604 100644
--- a/src/java/com/android/internal/telephony/metrics/PersistAtomsStorage.java
+++ b/src/java/com/android/internal/telephony/metrics/PersistAtomsStorage.java
@@ -1708,7 +1708,7 @@
Files.readAllBytes(mContext.getFileStreamPath(FILENAME).toPath()));
// Start from scratch if build changes, since mixing atoms from different builds could
// produce strange results
- if (!Build.FINGERPRINT.equals(atoms.buildFingerprint)) {
+ if (!String.valueOf(Build.TIME).equals(atoms.buildFingerprint)) {
Rlog.d(TAG, "Build changed");
return makeNewPersistAtoms();
}
@@ -2680,7 +2680,7 @@
PersistAtoms atoms = new PersistAtoms();
// allow pulling only after some time so data are sufficiently aggregated
long currentTime = getWallTimeMillis();
- atoms.buildFingerprint = Build.FINGERPRINT;
+ atoms.buildFingerprint = String.valueOf(Build.TIME);
atoms.voiceCallRatUsagePullTimestampMillis = currentTime;
atoms.voiceCallSessionPullTimestampMillis = currentTime;
atoms.incomingSmsPullTimestampMillis = currentTime;