From e0e76f399931e95e1309b8e20bf103c252f6e57f Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Wed, 19 Mar 2025 20:02:20 -0700 Subject: Fixed the phone number issue The phone number from UICC should always reflect the content from the SIM card instead of cached value. Fix: 387519623 Test: atest SubscriptionManagerServiceTest Flag: EXEMPT bug fixing Change-Id: Ied676c39b8459a02ec6debf4bcfdb666ecb13dbe --- .../telephony/subscription/SubscriptionManagerService.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java b/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java index 026bfff056..bedc20e9d5 100644 --- a/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java +++ b/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java @@ -3919,12 +3919,10 @@ public class SubscriptionManagerService extends ISub.Stub { case SubscriptionManager.PHONE_NUMBER_SOURCE_UICC: final Phone phone = PhoneFactory.getPhone(getSlotIndex(subId)); if (phone != null) { - String number = phone.getLine1Number(); - if (!TextUtils.isEmpty(number)) { - return number; - } + return TextUtils.emptyIfNull(phone.getLine1Number()); + } else { + return subInfo.getNumber(); } - return subInfo.getNumber(); case SubscriptionManager.PHONE_NUMBER_SOURCE_CARRIER: return subInfo.getNumberFromCarrier(); case SubscriptionManager.PHONE_NUMBER_SOURCE_IMS: -- cgit v1.2.3-59-g8ed1b