Catch exception in telephonyRepository.isDataEnabledFlow

And migrate BillingCycleRepository to use it.

Fix: 339197552
Test: manual - on data usage
Test: unit test
Change-Id: Ieac295f37fdbf75d184d66ea11f170652af3ec5f

src/com/android/settings/datausage/BillingCyclePreference.kt

@@ -26,11 +26,9 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.android.settings.R
 import com.android.settings.core.SubSettingLauncher
 import com.android.settings.datausage.lib.BillingCycleRepository
-import com.android.settings.network.mobileDataEnabledFlow
 import com.android.settings.spa.preference.ComposePreference
 import com.android.settingslib.spa.widget.preference.Preference
 import com.android.settingslib.spa.widget.preference.PreferenceModel
-import kotlinx.coroutines.flow.map
 
 /**
  * Preference which displays billing cycle of subscription
@@ -46,8 +44,8 @@ class BillingCyclePreference @JvmOverloads constructor(
 
     override fun setTemplate(template: NetworkTemplate, subId: Int) {
         setContent {
-            val isModifiable by remember {
-                context.mobileDataEnabledFlow(subId).map { repository.isModifiable(subId) }
+            val isModifiable by remember(subId) {
+                repository.isModifiableFlow(subId)
             }.collectAsStateWithLifecycle(initialValue = false)
 
             Preference(object : PreferenceModel {

src/com/android/settings/datausage/DataUsageList.kt

@@ -35,7 +35,7 @@ import com.android.settings.datausage.lib.BillingCycleRepository
 import com.android.settings.datausage.lib.NetworkUsageData
 import com.android.settings.network.MobileNetworkRepository
 import com.android.settings.network.SubscriptionUtil
-import com.android.settings.network.mobileDataEnabledFlow
+import com.android.settings.network.telephony.requireSubscriptionManager
 import com.android.settingslib.mobile.dataservice.SubscriptionInfoEntity
 import com.android.settingslib.spa.framework.util.collectLatestWithLifecycle
 import com.android.settingslib.spaprivileged.framework.common.userManager
@@ -113,8 +113,8 @@ open class DataUsageList : DashboardFragment() {
     override fun onViewCreated(v: View, savedInstanceState: Bundle?) {
         super.onViewCreated(v, savedInstanceState)
 
-        requireContext().mobileDataEnabledFlow(subId)
-            .collectLatestWithLifecycle(viewLifecycleOwner) { updatePolicy() }
+        billingCycleRepository.isModifiableFlow(subId)
+            .collectLatestWithLifecycle(viewLifecycleOwner, action = ::updatePolicy)
 
         val template = template ?: return
         viewModel.templateFlow.value = template
@@ -163,16 +163,14 @@ open class DataUsageList : DashboardFragment() {
     }
 
     /** Update chart sweeps and cycle list to reflect [NetworkPolicy] for current [template]. */
-    private fun updatePolicy() {
-        val isBillingCycleModifiable = isBillingCycleModifiable()
+    private fun updatePolicy(isModifiable: Boolean) {
+        val isBillingCycleModifiable = isModifiable && isActiveSubscription()
         dataUsageListHeaderController?.setConfigButtonVisible(isBillingCycleModifiable)
         chartDataUsagePreferenceController?.setBillingCycleModifiable(isBillingCycleModifiable)
     }
 
-    private fun isBillingCycleModifiable(): Boolean =
-        billingCycleRepository.isModifiable(subId) &&
-            requireContext().getSystemService(SubscriptionManager::class.java)!!
-                .getActiveSubscriptionInfo(subId) != null
+    private fun isActiveSubscription(): Boolean =
+            requireContext().requireSubscriptionManager().getActiveSubscriptionInfo(subId) != null
 
     /**
      * Updates the chart and detail data when initial loaded or selected cycle changed.

src/com/android/settings/datausage/lib/BillingCycleRepository.kt

@@ -19,10 +19,15 @@ package com.android.settings.datausage.lib
 import android.content.Context
 import android.os.INetworkManagementService
 import android.os.ServiceManager
-import android.telephony.TelephonyManager
 import android.util.Log
 import androidx.annotation.OpenForTesting
+import com.android.settings.network.telephony.TelephonyRepository
 import com.android.settingslib.spaprivileged.framework.common.userManager
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.conflate
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
 
 @OpenForTesting
 open class BillingCycleRepository @JvmOverloads constructor(
@@ -31,12 +36,14 @@ open class BillingCycleRepository @JvmOverloads constructor(
         INetworkManagementService.Stub.asInterface(
             ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE)
         ),
+    private val telephonyRepository: TelephonyRepository = TelephonyRepository(context),
 ) {
     private val userManager = context.userManager
-    private val telephonyManager = context.getSystemService(TelephonyManager::class.java)!!
 
-    fun isModifiable(subId: Int): Boolean =
-        isBandwidthControlEnabled() && userManager.isAdminUser && isDataEnabled(subId)
+    fun isModifiableFlow(subId: Int): Flow<Boolean> =
+        telephonyRepository.isDataEnabledFlow(subId).map { isDataEnabled ->
+            isDataEnabled && isBandwidthControlEnabled() && userManager.isAdminUser
+        }.conflate().flowOn(Dispatchers.Default)
 
     open fun isBandwidthControlEnabled(): Boolean = try {
         networkService.isBandwidthControlEnabled
@@ -45,10 +52,6 @@ open class BillingCycleRepository @JvmOverloads constructor(
         false
     }
 
-    private fun isDataEnabled(subId: Int): Boolean =
-        telephonyManager.createForSubscriptionId(subId)
-            .isDataEnabledForReason(TelephonyManager.DATA_ENABLED_REASON_USER)
-
     companion object {
         private const val TAG = "BillingCycleRepository"
     }