Enable Carrier-Config cache for Settings
- Since the "Mobile-Data Details Settings" (NETWORK_OPERATOR_SETTINGS) will query Carrier-Config around 70 times during launching, use the Carrier-Config cache to reduce 69 times to speed up the launching time.
- It takes about 3ms to query a Carrier-Config each time.
- Create a singleton class to share the Carrier-Config for all
sub-settings.
Bug: 204135235
Test: manual test
atest -c ApnPreferenceControllerTest \
AutoSelectPreferenceControllerTest \
BackupCallingPreferenceControllerTest \
CarrierConfigCacheTest \
CarrierPreferenceControllerTest \
CarrierSettingsVersionPreferenceControllerTest \
DataServiceSetupPreferenceControllerTest \
Enable2gPreferenceControllerTest \
EnabledNetworkModePreferenceControllerTest \
Enhanced4gBasePreferenceControllerTest \
MobileNetworkUtilsTest \
NetworkProviderBackupCallingGroupTest \
NrAdvancedCallingPreferenceControllerTest \
PreferredNetworkModePreferenceControllerTest \
TelephonyTogglePreferenceControllerTest \
WifiPickerTrackerHelperTest
make RunSettingsRoboTests \
ROBOTEST_FILTER=ContactDiscoveryPreferenceControllerTest
make RunSettingsRoboTests \
ROBOTEST_FILTER=VideoCallingPreferenceControllerTest
Change-Id: I26f9ac115a754910b5d59e820703f1a0e701bb7f
This commit is contained in:
@@ -30,6 +30,7 @@ import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.preference.SwitchPreference;
|
||||
|
||||
import com.android.settings.network.CarrierConfigCache;
|
||||
import com.android.settings.network.MobileDataEnabledListener;
|
||||
import com.android.settings.network.ims.VolteQueryImsState;
|
||||
import com.android.settings.network.ims.VtQueryImsState;
|
||||
@@ -48,7 +49,6 @@ public class VideoCallingPreferenceController extends TelephonyTogglePreferenceC
|
||||
private static final String TAG = "VideoCallingPreference";
|
||||
|
||||
private Preference mPreference;
|
||||
private CarrierConfigManager mCarrierConfigManager;
|
||||
private PhoneTelephonyCallback mTelephonyCallback;
|
||||
@VisibleForTesting
|
||||
Integer mCallState;
|
||||
@@ -56,7 +56,6 @@ public class VideoCallingPreferenceController extends TelephonyTogglePreferenceC
|
||||
|
||||
public VideoCallingPreferenceController(Context context, String key) {
|
||||
super(context, key);
|
||||
mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);
|
||||
mDataContentObserver = new MobileDataEnabledListener(context, this);
|
||||
mTelephonyCallback = new PhoneTelephonyCallback();
|
||||
}
|
||||
@@ -142,17 +141,8 @@ public class VideoCallingPreferenceController extends TelephonyTogglePreferenceC
|
||||
return false;
|
||||
}
|
||||
|
||||
// When called within Settings Search, this variable may still be null.
|
||||
if (mCarrierConfigManager == null) {
|
||||
Log.e(TAG, "CarrierConfigManager set to null.");
|
||||
mCarrierConfigManager = mContext.getSystemService(CarrierConfigManager.class);
|
||||
if (mCarrierConfigManager == null) {
|
||||
Log.e(TAG, "Unable to reinitialize CarrierConfigManager.");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(subId);
|
||||
final PersistableBundle carrierConfig =
|
||||
CarrierConfigCache.getInstance(mContext).getConfigForSubId(subId);
|
||||
if (carrierConfig == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user