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
src/com/android/settings/wifi/WifiPickerTrackerHelper.java
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;