Merge "Using upper case country code" into udc-dev am: 524b15c627

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809663

Change-Id: Id4b6f60415b6d029df04c60d956b88a8cfb0558b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
SongFerng Wang
2023-03-07 10:05:05 +00:00
committed by Automerger Merge Worker

View File

@@ -50,6 +50,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
@@ -560,7 +561,8 @@ public class SubscriptionUtil {
if (TextUtils.isEmpty(rawPhoneNumber)) {
return null;
}
String countryIso = MccTable.countryCodeForMcc(subscriptionInfo.getMccString());
String countryIso = MccTable.countryCodeForMcc(subscriptionInfo.getMccString())
.toUpperCase(Locale.ROOT);
return PhoneNumberUtils.formatNumber(rawPhoneNumber, countryIso);
}