Add use of net.tethering.noprovisioning to fetchDunApn
To make it easier to test tethering, have fetchDunApn return null when the system property net.tethering.noprovisioning is true. Change-Id: Id6162967c6b8b25f04380fe009961c150fa714ef
This commit is contained in:
@@ -559,14 +559,23 @@ public abstract class DataConnectionTracker extends Handler {
|
||||
}
|
||||
|
||||
protected ApnSetting fetchDunApn() {
|
||||
if (SystemProperties.getBoolean("net.tethering.noprovisioning", false)) {
|
||||
log("fetchDunApn: net.tethering.noprovisioning=true ret: null");
|
||||
return null;
|
||||
}
|
||||
Context c = mPhone.getContext();
|
||||
String apnData = Settings.Secure.getString(c.getContentResolver(),
|
||||
Settings.Secure.TETHER_DUN_APN);
|
||||
ApnSetting dunSetting = ApnSetting.fromString(apnData);
|
||||
if (dunSetting != null) return dunSetting;
|
||||
if (dunSetting != null) {
|
||||
if (VDBG) log("fetchDunApn: secure TETHER_DUN_APN dunSetting=" + dunSetting);
|
||||
return dunSetting;
|
||||
}
|
||||
|
||||
apnData = c.getResources().getString(R.string.config_tether_apndata);
|
||||
return ApnSetting.fromString(apnData);
|
||||
dunSetting = ApnSetting.fromString(apnData);
|
||||
if (VDBG) log("fetchDunApn: config_tether_apndata dunSetting=" + dunSetting);
|
||||
return dunSetting;
|
||||
}
|
||||
|
||||
public String[] getActiveApnTypes() {
|
||||
|
||||
Reference in New Issue
Block a user