Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Correct comments" am: 2c0b1b672e am: d6b4b6dc69 am: 7c4190ef37

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

Change-Id: I9679baba1e0b82881f92796c196dc3590b18ed41
This commit is contained in:
Treehugger Robot
2021-08-25 07:47:03 +00:00
committed by Automerger Merge Worker
parent ed410c03ac 7c4190ef37
commit e11d931b2a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/PacProxyManager.java
View File

@@ -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 = { @RequiresPermission(anyOf = {
android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.NETWORK_STACK,

2
services/core/java/com/android/server/connectivity/PacProxyService.java
View File

@@ -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 ProxyTracker through PacProxyManager before a broadcast takes place to allow
* the PacProxyService to indicate that the broadcast should not be sent and the * the PacProxyService to indicate that the broadcast should not be sent and the
* PacProxyService will trigger a new broadcast when it is ready. * PacProxyService will trigger a new broadcast when it is ready.