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

Android 15.0.0 release 5

Change-Id: I66b85f6f04bc1d2c0be65c4f8e3e2e7a8d49cfab

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZyveoAAKCRDorT+BmrEO
# eGsvAJ9J5Rf153Kp44Npc54gQFpFU2G7bACgkf1IYj0xcoWnYGT5yGrNzHK5Uxc=
# =97lz
# -----END PGP SIGNATURE-----
# gpg: Signature faite le mer 06 nov 2024 16:24:48 EST
# gpg:                avec la clef DSA 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Impossible de vérifier la signature : Pas de clef publique
diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index 47fd96e..3c5ff3b 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -559,16 +559,16 @@
                     SharedPreferences sharedPrefs =
                             PreferenceManager.getDefaultSharedPreferences(mContext);
                     final String lastFingerprint = sharedPrefs.getString(KEY_FINGERPRINT, null);
-                    if (!Build.FINGERPRINT.equals(lastFingerprint)) {
+                    if (!String.valueOf(Build.TIME).equals(lastFingerprint)) {
                         logd(
-                                "Build fingerprint changed. old: "
+                                "Build time changed. old: "
                                         + lastFingerprint
                                         + " new: "
-                                        + Build.FINGERPRINT);
+                                        + Build.TIME);
                         clearCachedConfigForPackage(null);
                         sharedPrefs
                                 .edit()
-                                .putString(KEY_FINGERPRINT, Build.FINGERPRINT)
+                                .putString(KEY_FINGERPRINT, String.valueOf(Build.TIME))
                                 .apply();
                     }
                     break;