commit 58f949afcfc45c7cd0ec3317f73f546dc5e3c0a2
author Aaron Huang <huangaaron@google.com> Tue Jun 08 04:34:24 2021 +0800
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Thu Jun 08 03:58:08 2023 +0000
tree b6f0c4aea08e2500ec3eb0d086e67563876aca08
parent b0594f1dee67d017ee80b1e637f7adb53ca28c5d

Add tests for PAC proxies.

Test: this is a change that adds a test
Bug: 138810051
Bug: 140610528
(cherry picked from https://android-review.googlesource.com/q/commit:40b524448cee6bb54db8c77a3fc266ca2a4dea28)
Merged-In: I6e7b77320f6baf32ac2f98634fa2e3231d1bf12f
Change-Id: I6e7b77320f6baf32ac2f98634fa2e3231d1bf12f
Bug: 263074841

service/src/com/android/server/ConnectivityService.java

diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java
index 5e225c1..de680a7 100755
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -865,8 +865,7 @@
 
     // A helper object to track the current default HTTP proxy. ConnectivityService needs to tell
     // the world when it changes.
-    @VisibleForTesting
-    protected final ProxyTracker mProxyTracker;
+    private final ProxyTracker mProxyTracker;
 
     final private SettingsObserver mSettingsObserver;
 
@@ -1893,6 +1892,13 @@
         mHandler.sendEmptyMessage(EVENT_INGRESS_RATE_LIMIT_CHANGED);
     }
 
+    @VisibleForTesting
+    void simulateUpdateProxyInfo(@Nullable final Network network,
+            @NonNull final ProxyInfo proxyInfo) {
+        Message.obtain(mHandler, EVENT_PROXY_HAS_CHANGED,
+                new Pair<>(network, proxyInfo)).sendToTarget();
+    }
+
     private void handleAlwaysOnNetworkRequest(
             NetworkRequest networkRequest, String settingName, boolean defaultValue) {
         final boolean enable = toBool(Settings.Global.getInt(

service/src/com/android/server/connectivity/ProxyTracker.java

diff --git a/service/src/com/android/server/connectivity/ProxyTracker.java b/service/src/com/android/server/connectivity/ProxyTracker.java
index bc0929c..b3cbb2a 100644
--- a/service/src/com/android/server/connectivity/ProxyTracker.java
+++ b/service/src/com/android/server/connectivity/ProxyTracker.java
@@ -330,7 +330,7 @@
     public void setDefaultProxy(@Nullable ProxyInfo proxyInfo) {
         synchronized (mProxyLock) {
             if (Objects.equals(mDefaultProxy, proxyInfo)) return;
-            if (proxyInfo != null &&  !proxyInfo.isValid()) {
+            if (proxyInfo != null && !proxyInfo.isValid()) {
                 if (DBG) Log.d(TAG, "Invalid proxy properties, ignoring: " + proxyInfo);
                 return;
             }