Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27e947f7 authored by SongFerng Wang's avatar SongFerng Wang Committed by Android (Google) Code Review
Browse files

Merge "Set Phone number format as LTR" into main

parents 08230350 3219f6da

src/com/android/settings/network/telephony/SubscriptionRepository.kt

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ fun Context.isSubscriptionEnabledFlow(subId: Int) = subscriptionsChangedFlow().m 
    .flowOn(Dispatchers.Default)



fun Context.phoneNumberFlow(subscriptionInfo: SubscriptionInfo) = subscriptionsChangedFlow().map {

    SubscriptionUtil.getFormattedPhoneNumber(this, subscriptionInfo)

    SubscriptionUtil.getBidiFormattedPhoneNumber(this, subscriptionInfo)

}.filterNot { it.isNullOrEmpty() }.flowOn(Dispatchers.Default)



fun Context.subscriptionsChangedFlow() = callbackFlow {

src/com/android/settings/spa/network/PrimarySimRepository.kt

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ class PrimarySimRepository(private val context: Context) { 
            val item = ListPreferenceOption(

                id = info.subscriptionId,

                text = "${info.displayName}",

                summary = SubscriptionUtil.getFormattedPhoneNumber(context, info) ?: "",

                summary = SubscriptionUtil.getBidiFormattedPhoneNumber(context, info) ?: "",

            )

            callsAndSmsList += item

            dataList += item