PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduce api calls when getDataSummary

Browse Source 
When defaultSubId == activeSubId, return display name directly.

Bug: 339884322
Flag: com.android.settings.flags.internet_preference_controller_v2
Test: manual - on Internet
Change-Id: I8422c709483069a6894b99d5cc2cc652459ab5e0
This commit is contained in:
Chaohui Wang
2024-06-17 14:00:03 +08:00
parent 2f71bc764d
commit dc02b5ea59
1 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/com/android/settings/network/telephony/DataSubscriptionRepository.kt
View File

@@ -51,46 +51,41 @@ class DataSubscriptionRepository(
)
.map { it.getIntExtra(SUBSCRIPTION_KEY, SubscriptionManager.INVALID_SUBSCRIPTION_ID) }
.onStart { emit(SubscriptionManager.getDefaultDataSubscriptionId()) }
.distinctUntilChanged()
.conflate()
.flowOn(Dispatchers.Default)
fun activeDataSubscriptionIdFlow(): Flow<Int> =
telephonyManager.telephonyCallbackFlow {
object : TelephonyCallback(), TelephonyCallback.ActiveDataSubscriptionIdListener {
override fun onActiveDataSubscriptionIdChanged(subId: Int) {
trySend(subId)
Log.d(TAG, "activeDataSubscriptionIdFlow: $subId")
telephonyManager
.telephonyCallbackFlow {
object : TelephonyCallback(), TelephonyCallback.ActiveDataSubscriptionIdListener {
override fun onActiveDataSubscriptionIdChanged(subId: Int) {
trySend(subId)
Log.d(TAG, "activeDataSubscriptionIdFlow: $subId")
}
}
}
}
.distinctUntilChanged()
fun dataSummaryFlow(): Flow<String> =
combine(defaultDataSubscriptionIdFlow(), activeDataSubscriptionIdFlow()) {
defaultSubId,
activeSubId ->
DataSubscriptionIds(defaultSubId, activeSubId)
defaultDataSubId,
activeDataSubId ->
getDataSummary(defaultDataSubId, activeDataSubId)
}
.distinctUntilChanged()
.map { it.getDataSummary() }
.conflate()
.flowOn(Dispatchers.Default)
private data class DataSubscriptionIds(
val defaultSubId: Int,
val activeSubId: Int,
)
private fun DataSubscriptionIds.getDataSummary(): String {
val activeSubInfo = subscriptionManager.getActiveSubscriptionInfo(activeSubId) ?: return ""
private fun getDataSummary(defaultDataSubId: Int, activeDataSubId: Int): String {
if (defaultDataSubId == activeDataSubId) return getDisplayName(defaultDataSubId)
val activeSubInfo =
subscriptionManager.getActiveSubscriptionInfo(activeDataSubId)
?: return getDisplayName(defaultDataSubId)
if (!SubscriptionUtil.isSubscriptionVisible(subscriptionManager, context, activeSubInfo)) {
return getDisplayName(defaultSubId)
}
val uniqueName = getDisplayName(activeSubId)
return if (activeSubId == defaultSubId) {
uniqueName
} else {
context.getString(R.string.mobile_data_temp_using, uniqueName)
return getDisplayName(defaultDataSubId)
}
// non-DDS is active
return context.getString(R.string.mobile_data_temp_using, getDisplayName(activeDataSubId))
}
companion object {