diff options
author | Wink Saville <wink@google.com> | 2012-01-06 23:43:37 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-06 23:43:37 -0800 |
commit | 7a939077bd14521c7d351af98df7ed75a8ec9c15 (patch) | |
tree | 21f368a287ef6c8f385d27876dddfce4aaf901f7 | |
parent | b33eb3f0776e53ab38e8db5e162df2bb881add95 (diff) | |
parent | 43420a49f942e5580ddef2311a8c5e872428116a (diff) | |
download | frameworks_base-7a939077bd14521c7d351af98df7ed75a8ec9c15.zip frameworks_base-7a939077bd14521c7d351af98df7ed75a8ec9c15.tar.gz frameworks_base-7a939077bd14521c7d351af98df7ed75a8ec9c15.tar.bz2 |
Merge "Add use of net.tethering.noprovisioning to fetchDunApn"
-rw-r--r-- | telephony/java/com/android/internal/telephony/DataConnectionTracker.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/DataConnectionTracker.java b/telephony/java/com/android/internal/telephony/DataConnectionTracker.java index 26967a0..dab72a9 100644 --- a/telephony/java/com/android/internal/telephony/DataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/DataConnectionTracker.java @@ -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() { |