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

Merge "mainline: remove CarrierConfigManager.init"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-01-10 18:48:20 +00:00
committed by Android (Google) Code Review
parent e9a38a37ba 762e193266
commit 01a55e950d
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/network/telephony/ApnPreferenceController.java
View File

@@ -52,7 +52,7 @@ public class ApnPreferenceController extends TelephonyBasePreferenceController i
public ApnPreferenceController(Context context, String key) { public ApnPreferenceController(Context context, String key) {
super(context, key); super(context, key);
mCarrierConfigManager = new CarrierConfigManager(context); mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);
mDpcApnEnforcedObserver = new DpcApnEnforcedObserver(new Handler(Looper.getMainLooper())); mDpcApnEnforcedObserver = new DpcApnEnforcedObserver(new Handler(Looper.getMainLooper()));
} }

2
src/com/android/settings/network/telephony/CarrierPreferenceController.java
View File

@@ -38,7 +38,7 @@ public class CarrierPreferenceController extends TelephonyBasePreferenceControll
public CarrierPreferenceController(Context context, String key) { public CarrierPreferenceController(Context context, String key) {
super(context, key); super(context, key);
mCarrierConfigManager = new CarrierConfigManager(context); mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);
} }
public void init(int subId) { public void init(int subId) {

2
src/com/android/settings/network/telephony/RoamingDialogFragment.java
View File

@@ -54,7 +54,7 @@ public class RoamingDialogFragment extends InstrumentedDialogFragment implements
super.onAttach(context); super.onAttach(context);
final Bundle args = getArguments(); final Bundle args = getArguments();
mSubId = args.getInt(SUB_ID_KEY); mSubId = args.getInt(SUB_ID_KEY);
mCarrierConfigManager = new CarrierConfigManager(context); mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);
} }
@Override @Override