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

Commit 4a35f10b authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Change-Id: I49d7bcc5bc41047989ebef21b825847d1e3312b5
parents b1dc0cc8 f20c54d2

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

+2 −1
Original line number Diff line number Diff line
@@ -2722,7 +2722,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 ("