| commit | d6b4b6dc690467b412a181f3ec19ae2830ef444f | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Aug 25 07:17:26 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 25 07:17:26 2021 +0000 |
| tree | 1cd572eff14ebf1e770ded04f4c798659aff6706 | |
| parent | 05820c8ff6c53439e5f2d12b46ced46c14141fa7 [diff] | |
| parent | 2c0b1b672ef6a216084258a12e9d61f9c7d507f5 [diff] |
Merge "Correct comments" am: 2c0b1b672e Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1784149 Change-Id: I3bc94fb7cbc33dc32bb4b0adf5282814bac75232
diff --git a/core/java/android/net/PacProxyManager.java b/core/java/android/net/PacProxyManager.java index 8f7ad8c..da79634 100644 --- a/core/java/android/net/PacProxyManager.java +++ b/core/java/android/net/PacProxyManager.java
@@ -94,7 +94,7 @@ } /** - * 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,
diff --git a/services/core/java/com/android/server/connectivity/PacProxyService.java b/services/core/java/com/android/server/connectivity/PacProxyService.java index 0070339..b2df535 100644 --- a/services/core/java/com/android/server/connectivity/PacProxyService.java +++ b/services/core/java/com/android/server/connectivity/PacProxyService.java
@@ -192,7 +192,7 @@ } /** - * 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.