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

Commit 7dab6145 authored by Jason Monk's avatar Jason Monk
Browse files

Fix reference to ProxyInfo extra 

Also remove unneeded null check.

Change-Id: Ic25d1087f93632a24755b284ede41d870492e25d
parent 0598cc58

core/java/android/net/ProxyInfo.java

+0 −3
Original line number Diff line number Diff line
@@ -155,9 +155,6 @@ public class ProxyInfo implements Parcelable { 
            mHost = source.getHost();

            mPort = source.getPort();

            mPacFileUrl = source.mPacFileUrl;

            if (mPacFileUrl == null) {

                mPacFileUrl = Uri.EMPTY;

            }

            mExclusionList = source.getExclusionListAsString();

            mParsedExclusionList = source.mParsedExclusionList;

        } else {

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -13879,7 +13879,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
        }















        if (Proxy.PROXY_CHANGE_ACTION.equals(intent.getAction())) {













            ProxyInfo proxy = intent.getParcelableExtra("proxy");













            ProxyInfo proxy = intent.getParcelableExtra(Proxy.EXTRA_PROXY_INFO);















            mHandler.sendMessage(mHandler.obtainMessage(UPDATE_HTTP_PROXY_MSG, proxy));















        }