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

Commit 1578772d authored by Chaohui Wang's avatar Chaohui Wang Committed by Automerger Merge Worker
Browse files

Fix crash when call getMobileTemplate am: 9132535e 

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



Change-Id: I01c40793839a7d5fbd0b7834c67184c228356c0f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5a0d4d1c 9132535e

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

+2 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import androidx.preference.Preference 
import androidx.preference.PreferenceScreen

import com.android.settings.R

import com.android.settings.datausage.DataUsageUtils

import com.android.settings.datausage.lib.DataUsageLib

import com.android.settingslib.net.DataUsageController

import kotlinx.coroutines.Dispatchers

import kotlinx.coroutines.launch
@@ -96,7 +97,7 @@ class DataUsagePreferenceController(context: Context, key: String) : 


    private fun getNetworkTemplate(): NetworkTemplate? = when {

        SubscriptionManager.isValidSubscriptionId(mSubId) -> {

            DataUsageUtils.getMobileTemplate(mContext, mSubId)

            DataUsageLib.getMobileTemplate(mContext, mSubId)

        }



        else -> null

tests/spa_unit/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.kt

+3 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import com.android.dx.mockito.inline.extended.ExtendedMockito 
import com.android.settings.core.BasePreferenceController.AVAILABLE

import com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE

import com.android.settings.datausage.DataUsageUtils

import com.android.settings.datausage.lib.DataUsageLib

import com.android.settingslib.net.DataUsageController

import com.android.settingslib.net.DataUsageController.DataUsageInfo

import com.android.settingslib.spa.testutils.waitUntil
@@ -80,13 +81,14 @@ class DataUsagePreferenceControllerTest { 
            .initMocks(this)

            .mockStatic(SubscriptionManager::class.java)

            .spyStatic(DataUsageUtils::class.java)

            .spyStatic(DataUsageLib::class.java)

            .strictness(Strictness.LENIENT)

            .startMocking()



        whenever(SubscriptionManager.isValidSubscriptionId(SUB_ID)).thenReturn(true)

        ExtendedMockito.doReturn(true).`when` { DataUsageUtils.hasMobileData(context) }

        ExtendedMockito.doReturn(networkTemplate)

            .`when` { DataUsageUtils.getMobileTemplate(context, SUB_ID) }

            .`when` { DataUsageLib.getMobileTemplate(context, SUB_ID) }

        preference.key = TEST_KEY

        whenever(preferenceScreen.findPreference<Preference>(TEST_KEY)).thenReturn(preference)