Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1902807b authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Replace ProxyInfo with buildDirectProxy for Mainline" am: 45a5eb23... 

Merge "Replace ProxyInfo with buildDirectProxy for Mainline" am: 45a5eb23 am: f20c54d2 am: 4a35f10b

Change-Id: Ic0236e160c74b30bb90be2cba47ec681c4c06ffd
parents a474dc25 4a35f10b

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+2 −1
Original line number Diff line number Diff line
@@ -2780,7 +2780,8 @@ public class DcTracker extends Handler { 
                        if (port == -1) {

                            port = 8080;

                        }

                        ProxyInfo proxy = new ProxyInfo(apn.getProxyAddressAsString(), port, null);

                        ProxyInfo proxy = ProxyInfo.buildDirectProxy(

                                apn.getProxyAddressAsString(), port);

                        dataConnection.setLinkPropertiesHttpProxy(proxy);

                    } catch (NumberFormatException e) {

                        loge("onDataSetupComplete: NumberFormatException making ProxyProperties ("