Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 904fb9d7: Merge "Notify people of empty proxies too." into ics-factoryrom

Browse Source 
* commit '904fb9d79cc72879e4c6767c219ec78feda8e62b':
  Notify people of empty proxies too.
This commit is contained in:
Wink Saville
2011-09-22 10:53:40 -07:00
committed by Android Git Automerger
parent e690f565fd 904fb9d79c
commit 94097b44b8
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/java/com/android/server/ConnectivityService.java
View File

@@ -2618,7 +2618,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
} }
} }
if (VDBG) log("changing default proxy to " + proxy); if (VDBG) log("changing default proxy to " + proxy);
if ((proxy == null && mGlobalProxy == null) || proxy.equals(mGlobalProxy)) return;
// global trumps default, if set, ignore this.
if (mGlobalProxy != null) return; if (mGlobalProxy != null) return;
sendProxyBroadcast(proxy); sendProxyBroadcast(proxy);
} }

4
telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
View File

@@ -1768,8 +1768,10 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
ApnSetting apn = apnContext.getApnSetting(); ApnSetting apn = apnContext.getApnSetting();
if (apn.proxy != null && apn.proxy.length() != 0) { if (apn.proxy != null && apn.proxy.length() != 0) {
try { try {
String port = apn.port;
if (TextUtils.isEmpty(port)) port = "8080";
ProxyProperties proxy = new ProxyProperties(apn.proxy, ProxyProperties proxy = new ProxyProperties(apn.proxy,
Integer.parseInt(apn.port), null); Integer.parseInt(port), null);
dcac.setLinkPropertiesHttpProxySync(proxy); dcac.setLinkPropertiesHttpProxySync(proxy);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
loge("onDataSetupComplete: NumberFormatException making ProxyProperties (" + loge("onDataSetupComplete: NumberFormatException making ProxyProperties (" +