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

Commit f20c54d2 authored by Shuo Qian's avatar Shuo Qian Committed by android-build-merger
Browse files

Merge "Replace ProxyInfo with buildDirectProxy for Mainline" 

am: 45a5eb23

Change-Id: Ifaeea036e3a80b266ec5a2adff3f542de3c85dac
parents 0f172cf7 45a5eb23

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 ("