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

Merge "Enable Carrier-Config cache for Settings"

Browse Source
This commit is contained in:
Weng Su
2022-01-17 14:24:50 +00:00
committed by Android (Google) Code Review
parent 99c4cabe14 7822750c31
commit cfe2804647
30 changed files with 430 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/robotests/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceControllerTest.java
View File

@@ -48,6 +48,7 @@ import androidx.fragment.app.FragmentTransaction;
import androidx.lifecycle.LifecycleOwner;
import androidx.preference.SwitchPreference;
import com.android.settings.network.CarrierConfigCache;
import com.android.settings.network.SubscriptionUtil;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -72,7 +73,7 @@ public class ContactDiscoveryPreferenceControllerTest {
@Mock private ImsManager mImsManager;
@Mock private ImsRcsManager mImsRcsManager;
@Mock private RcsUceAdapter mRcsUceAdapter;
@Mock private CarrierConfigManager mCarrierConfigManager;
@Mock private CarrierConfigCache mCarrierConfigCache;
@Mock private ContentResolver mContentResolver;
@Mock private FragmentManager mFragmentManager;
@Mock private FragmentTransaction mFragmentTransaction;
@@ -93,8 +94,8 @@ public class ContactDiscoveryPreferenceControllerTest {
doReturn(mImsManager).when(mContext).getSystemService(ImsManager.class);
doReturn(mImsRcsManager).when(mImsManager).getImsRcsManager(anyInt());
doReturn(mRcsUceAdapter).when(mImsRcsManager).getUceAdapter();
doReturn(mCarrierConfigManager).when(mContext).getSystemService(CarrierConfigManager.class);
doReturn(mCarrierConfig).when(mCarrierConfigManager).getConfigForSubId(eq(TEST_SUB_ID));
CarrierConfigCache.setTestInstance(mContext, mCarrierConfigCache);
doReturn(mCarrierConfig).when(mCarrierConfigCache).getConfigForSubId(eq(TEST_SUB_ID));
// Start all tests with presence being disabled.
setRcsPresenceConfig(false);
doReturn(mContentResolver).when(mContext).getContentResolver();

8
tests/robotests/src/com/android/settings/network/telephony/VideoCallingPreferenceControllerTest.java
View File

@@ -31,6 +31,7 @@ import android.telephony.ims.ProvisioningManager;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import com.android.settings.network.CarrierConfigCache;
import com.android.settings.network.ims.MockVolteQueryImsState;
import com.android.settings.network.ims.MockVtQueryImsState;
@@ -51,7 +52,7 @@ public class VideoCallingPreferenceControllerTest {
@Mock
private ProvisioningManager mProvisioningManager;
@Mock
private CarrierConfigManager mCarrierConfigManager;
private CarrierConfigCache mCarrierConfigCache;
@Mock
private PreferenceScreen mPreferenceScreen;
@@ -69,14 +70,13 @@ public class VideoCallingPreferenceControllerTest {
mContext = spy(RuntimeEnvironment.application);
doReturn(mTelephonyManager).when(mContext).getSystemService(TelephonyManager.class);
doReturn(mCarrierConfigManager).when(mContext)
.getSystemService(CarrierConfigManager.class);
CarrierConfigCache.setTestInstance(mContext, mCarrierConfigCache);
doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
mCarrierConfig = new PersistableBundle();
mCarrierConfig.putBoolean(
CarrierConfigManager.KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS, true);
doReturn(mCarrierConfig).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
doReturn(mCarrierConfig).when(mCarrierConfigCache).getConfigForSubId(SUB_ID);
mQueryImsState = new MockVtQueryImsState(mContext, SUB_ID);
mQueryImsState.setIsEnabledByUser(true);