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

Commit 47f2fcd7 authored by Yuyang Huang's avatar Yuyang Huang Committed by Automerger Merge Worker
Browse files

Merge "Add PROPERTY_SELF_CERTIFIED_NETWORK_CAPABILITIES API" am: 24db2701 am: e1e0456d 

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



Change-Id: I51a42077e0cadcb83557931d6171987fde7d6801
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3f72b0d8 e1e0456d

core/api/current.txt

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

core/java/android/content/pm/PackageManager.java

+23 −0
Original line number Diff line number Diff line
@@ -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.