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

Commit 4a144513 authored by Aaron Huang's avatar Aaron Huang Committed by Automerger Merge Worker
Browse files

Merge "Expose Context#PAC_PROXY_SERVICE as module lib API" am: 248a42ca am: 06007f03 

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

Change-Id: If0e78b4bdce820f9eb22f231f57d5ce841005328
parents e314e455 06007f03

core/api/module-lib-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

  }

core/java/android/content/Context.java

+1 −0
Original line number Diff line number Diff line
@@ -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";



    /**