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

Android 15.0.0 Release 6 (AP4A.241205.013)

Change-Id: I75f8055457869719814ecc75a3cfed73164aabc8
Signed-off-by: micky387 <mickaelsaibi@free.fr>
diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index c6c26b0..52920e3 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -558,16 +558,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;