Merge tag 'android-15.0.0_r5' of https://android.googlesource.com/platform/frameworks/opt/telephony into HEAD
Android 15.0.0 release 5
Change-Id: I82b6dbab981ed4f18054dbba65483d5666366869
# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZyvelwAKCRDorT+BmrEO
# eL6rAJ9HBbUnxYRtwRWOQi7vSCIo3wyNqwCZAaNujf93fr+lvdtpqxX05Rt5dd8=
# =0clU
# -----END PGP SIGNATURE-----
# gpg: Signature faite le mer 06 nov 2024 16:24:39 EST
# 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 12dab7a..b9307d0 100644
--- a/src/java/com/android/internal/telephony/metrics/PersistAtomsStorage.java
+++ b/src/java/com/android/internal/telephony/metrics/PersistAtomsStorage.java
@@ -1698,7 +1698,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();
}
@@ -2627,7 +2627,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;