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

Commit 7c4190ef authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Correct comments" am: 2c0b1b67 am: d6b4b6dc 

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

Change-Id: I594aaa568ba6743b45ab665f8e3e5dbb357f8323
parents f2e43404 d6b4b6dc

core/java/android/net/PacProxyManager.java

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ public class PacProxyManager { 
    }



    /**

     * Updates the PAC Proxy Installer with current Proxy information.

     * Updates the PAC Proxy Service with current Proxy information.

     */

    @RequiresPermission(anyOf = {

            android.Manifest.permission.NETWORK_STACK,

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

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ public class PacProxyService extends IPacProxyManager.Stub { 
    }



    /**

     * Updates the PAC Proxy Installer with current Proxy information. This is called by

     * Updates the PAC Proxy Service with current Proxy information. This is called by

     * the ProxyTracker through PacProxyManager before a broadcast takes place to allow

     * the PacProxyService to indicate that the broadcast should not be sent and the

     * PacProxyService will trigger a new broadcast when it is ready.