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

Merge "Add PROPERTY_SELF_CERTIFIED_NETWORK_CAPABILITIES API" am: 24db27017f

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

Change-Id: I10b03249118727c2c69b07bebdb1ea06b19ff0d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yuyang Huang
2023-02-07 09:10:50 +00:00
committed by Automerger Merge Worker
parent edb504ebf5 24db27017f
commit e1e0456d12
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -12079,6 +12079,7 @@ package android.content.pm {
field public static final int PERMISSION_DENIED = -1; // 0xffffffff
field public static final int PERMISSION_GRANTED = 0; // 0x0
field public static final String PROPERTY_MEDIA_CAPABILITIES = "android.media.PROPERTY_MEDIA_CAPABILITIES";
field public static final String PROPERTY_SELF_CERTIFIED_NETWORK_CAPABILITIES = "android.net.PROPERTY_SELF_CERTIFIED_NETWORK_CAPABILITIES";
field public static final int SIGNATURE_FIRST_NOT_SIGNED = -1; // 0xffffffff
field public static final int SIGNATURE_MATCH = 0; // 0x0
field public static final int SIGNATURE_NEITHER_SIGNED = 1; // 0x1

23
core/java/android/content/pm/PackageManager.java
View File

@@ -150,6 +150,29 @@ public abstract class PackageManager {
public static final String PROPERTY_MEDIA_CAPABILITIES =
"android.media.PROPERTY_MEDIA_CAPABILITIES";
/**
* &lt;application&gt; level {@link android.content.pm.PackageManager.Property} tag
* specifying the XML resource ID containing the declaration of the self-certified network
* capabilities used by the application.
*
* <p> Starting from Android 14, usage of some network capabilities in
* {@link android.net.ConnectivityManager#requestNetwork} require the application to
* declare its usage of that particular capability in this resource. Only some capabilities
* require a declaration. Please look up the specific capability you want to use in
* {@link android.net.NetworkCapabilities} to see if it needs declaration in this property.
*
* For example:
* &lt;application&gt;
* &lt;property android:name="android.net.PROPERTY_SELF_CERTIFIED_NETWORK_CAPABILITIES"
* android:resource="@xml/self_certified_network_capabilities"&gt;
* &lt;application&gt;
*
* <p> The detail format of self_certified_network_capabilities.xml is described in
* {@link android.net.NetworkRequest}
*/
public static final String PROPERTY_SELF_CERTIFIED_NETWORK_CAPABILITIES =
"android.net.PROPERTY_SELF_CERTIFIED_NETWORK_CAPABILITIES";
/**
* Application level property that an app can specify to opt-out from having private data
* directories both on the internal and external storages.