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:
Weng Su
2022-01-11 06:44:40 +08:00
parent 7b5f806734
commit 7822750c31
30 changed files with 430 additions and 151 deletions

View File

@@ -35,6 +35,7 @@ import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.network.CarrierConfigCache;
import com.android.settings.overlay.FeatureFactory;
import com.android.wifitrackerlib.MergedCarrierEntry;
import com.android.wifitrackerlib.WifiEntry;
@@ -64,7 +65,7 @@ public class WifiPickerTrackerHelper implements LifecycleObserver {
protected HandlerThread mWorkerThread;
protected final WifiManager mWifiManager;
protected final CarrierConfigManager mCarrierConfigManager;
protected final CarrierConfigCache mCarrierConfigCache;
public WifiPickerTrackerHelper(@NonNull Lifecycle lifecycle, @NonNull Context context,
@Nullable WifiPickerTracker.WifiPickerTrackerCallback listener) {
@@ -88,7 +89,7 @@ public class WifiPickerTrackerHelper implements LifecycleObserver {
listener);
mWifiManager = context.getSystemService(WifiManager.class);
mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);
mCarrierConfigCache = CarrierConfigCache.getInstance(context);
}
/** @OnLifecycleEvent(ON_DESTROY) */
@@ -104,7 +105,7 @@ public class WifiPickerTrackerHelper implements LifecycleObserver {
/** Return the enabled/disabled state of the carrier network provision */
public boolean isCarrierNetworkProvisionEnabled(int subId) {
final PersistableBundle config = mCarrierConfigManager.getConfigForSubId(subId);
final PersistableBundle config = mCarrierConfigCache.getConfigForSubId(subId);
if (config == null) {
Log.e(TAG, "Could not get carrier config, subId:" + subId);
return false;