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

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

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

Change-Id: If0e78b4bdce820f9eb22f231f57d5ce841005328
This commit is contained in:
Aaron Huang
2021-04-06 13:18:58 +00:00
committed by Automerger Merge Worker
parent e314e455b3 06007f0302
commit 4a14451368
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/module-lib-current.txt
View File

@@ -23,6 +23,7 @@ package android.app.usage {
package android.content { package android.content {
public abstract class Context { public abstract class Context {
field public static final String PAC_PROXY_SERVICE = "pac_proxy";
field public static final String TEST_NETWORK_SERVICE = "test_network"; field public static final String TEST_NETWORK_SERVICE = "test_network";
} }

1
core/java/android/content/Context.java
View File

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