From 9132535e5edc1ca2b441578328fab5f001666f92 Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Mon, 10 Jul 2023 14:16:26 +0800 Subject: [PATCH] Fix crash when call getMobileTemplate There are 2 versions of getMobileTemplate. The previous Change I7865823d6af2c812afa35d047bd79b60ae4b0fb7 change from the correct version to the wrong version. Change back to fix the issue. Fix: 290381395 Test: manual - on Mobile Settings page Test: unit test Change-Id: Icb3147558176d53dc77e7bd39ab54a5dad13c12b Merged-In: I6227f973ec38e5b0520f54a41ac2ede2929a1bcc --- .../network/telephony/DataUsagePreferenceController.kt | 3 ++- .../network/telephony/DataUsagePreferenceControllerTest.kt | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/network/telephony/DataUsagePreferenceController.kt b/src/com/android/settings/network/telephony/DataUsagePreferenceController.kt index 14adf6f1918..88da325c3e6 100644 --- a/src/com/android/settings/network/telephony/DataUsagePreferenceController.kt +++ b/src/com/android/settings/network/telephony/DataUsagePreferenceController.kt @@ -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 diff --git a/tests/spa_unit/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.kt b/tests/spa_unit/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.kt index a9d343fa0b5..a42e41ed77e 100644 --- a/tests/spa_unit/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.kt +++ b/tests/spa_unit/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.kt @@ -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(TEST_KEY)).thenReturn(preference)