Merge "Expose Context#PAC_PROXY_SERVICE as module lib API"

2021-04-06 12:27:53 +00:00
parent bc3fff46d9 46d99ea11f
commit 248a42ca89
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";

    /**