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

Commit 15587cc7 authored by Aaron Huang's avatar Aaron Huang Committed by Automerger Merge Worker
Browse files

Merge "Remove hidden API usage from ProxyTracker" am: 3f4d2a6f am: 6ddd31dc 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646966

Change-Id: Idd7ae6ad01db35ed2ea47abab183ae423439ede9
parents ee70e4d9 6ddd31dc

services/core/java/com/android/server/connectivity/ProxyTracker.java

+1 −2
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import android.net.ProxyInfo; 
import android.net.Uri;

import android.os.Binder;

import android.os.Handler;

import android.os.HandlerExecutor;

import android.os.UserHandle;

import android.provider.Settings;

import android.text.TextUtils;
@@ -105,7 +104,7 @@ public class ProxyTracker { 


        PacProxyInstalledListener listener = new PacProxyInstalledListener(pacChangedEvent);

        mPacProxyManager.addPacProxyInstalledListener(

                new HandlerExecutor(mConnectivityServiceHandler), listener);

                mConnectivityServiceHandler::post, listener);

    }



    // Convert empty ProxyInfo's to null as null-checks are used to determine if proxies are present