Merge "Expose Context#PAC_PROXY_SERVICE as module lib API" am: 248a42ca89

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664305 Change-Id: Ic3fca6892c37636dfc0e8470b8e663fda3dfd51a
2021-04-06 12:42:00 +00:00
parent 7851e524e7 248a42ca89
commit 06007f0302
2 changed files with 2 additions and 0 deletions
--- a/core/api/module-lib-current.txt
+++ b/core/api/module-lib-current.txt
@@ -23,6 +23,7 @@ package android.app.usage {
 package android.content {

  public abstract class Context {
+    field public static final String PAC_PROXY_SERVICE = "pac_proxy";
    field public static final String TEST_NETWORK_SERVICE = "test_network";
  }

--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -4026,6 +4026,7 @@ public abstract class Context {
     * @see android.net.PacProxyManager
     * @hide
     */
+    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
    public static final String PAC_PROXY_SERVICE = "pac_proxy";

    /**