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

Use single queryDetailsForDevice if possible

Browse Source 
To improve performance.

Since queryDetailsForDevice() also aggregated the uids into one,
the apps list in DataUsageList still needs another separated api call.

Fix: 315449973
Test: manual - on DataUsageList page
Test: unit tests
Change-Id: I96c23dd7d0d40ecd183e0fb0f61329db42dae1ab
This commit is contained in:
Chaohui Wang
2023-12-15 16:36:05 +08:00
parent cb9870b087
commit 51fc4bef49
14 changed files with 405 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/com/android/settings/datausage/ChartDataUsagePreferenceController.kt
View File

@@ -18,39 +18,22 @@ package com.android.settings.datausage
import android.content.Context
import android.net.NetworkTemplate
import androidx.annotation.OpenForTesting
import androidx.annotation.VisibleForTesting
import androidx.lifecycle.LifecycleCoroutineScope
import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.lifecycleScope
import androidx.preference.PreferenceScreen
import com.android.settings.core.BasePreferenceController
import com.android.settings.datausage.lib.INetworkCycleDataRepository
import com.android.settings.datausage.lib.NetworkCycleChartData
import com.android.settings.datausage.lib.NetworkCycleDataRepository
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
@OpenForTesting
open class ChartDataUsagePreferenceController(context: Context, preferenceKey: String) :
class ChartDataUsagePreferenceController(context: Context, preferenceKey: String) :
BasePreferenceController(context, preferenceKey) {
private lateinit var repository: INetworkCycleDataRepository
private lateinit var preference: ChartDataUsagePreference
private lateinit var lifecycleScope: LifecycleCoroutineScope
private var lastStartTime: Long? = null
private var lastEndTime: Long? = null
open fun init(template: NetworkTemplate) {
fun init(template: NetworkTemplate) {
this.repository = NetworkCycleDataRepository(mContext, template)
}
@VisibleForTesting
fun init(repository: INetworkCycleDataRepository) {
this.repository = repository
}
override fun getAvailabilityStatus() = AVAILABLE
override fun displayPreference(screen: PreferenceScreen) {
@@ -58,33 +41,20 @@ open class ChartDataUsagePreferenceController(context: Context, preferenceKey: S
preference = screen.findPreference(preferenceKey)!!
}
override fun onViewCreated(viewLifecycleOwner: LifecycleOwner) {
lifecycleScope = viewLifecycleOwner.lifecycleScope
}
/**
* Sets whether billing cycle modifiable.
*
* Don't bind warning / limit sweeps if not modifiable.
*/
open fun setBillingCycleModifiable(isModifiable: Boolean) {
fun setBillingCycleModifiable(isModifiable: Boolean) {
preference.setNetworkPolicy(
if (isModifiable) repository.getPolicy() else null
)
}
fun update(startTime: Long, endTime: Long) {
if (lastStartTime == startTime && lastEndTime == endTime) return
lastStartTime = startTime
lastEndTime = endTime
preference.setTime(startTime, endTime)
preference.setNetworkCycleData(NetworkCycleChartData.AllZero)
lifecycleScope.launch {
val chartData = withContext(Dispatchers.Default) {
repository.queryChartData(startTime, endTime)
}
preference.setNetworkCycleData(chartData)
}
/** Updates chart to show selected cycle. */
fun update(chartData: NetworkCycleChartData) {
preference.setTime(chartData.total.startTime, chartData.total.endTime)
preference.setNetworkCycleData(chartData)
}
}