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

Commit 510f0613 authored by Zimuzo Ezeozue's avatar Zimuzo Ezeozue Committed by Automerger Merge Worker
Browse files

Merge "Add PROPERTY_MEDIA_CAPABILITIES API" into sc-dev am: dacdd6fd 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7c4b4c20a5ec86e4f861c41dbb3d8ff4271c9abe
parents d9b77be3 dacdd6fd

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -12473,6 +12473,7 @@ package android.content.pm { 
    field public static final long MAXIMUM_VERIFICATION_TIMEOUT = 3600000L; // 0x36ee80L

    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 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

+13 −0
Original line number Diff line number Diff line
@@ -117,6 +117,19 @@ public abstract class PackageManager { 
        }

    }



    /**

     * <application> level {@link android.content.pm.PackageManager.Property} tag specifying

     * the XML resource ID containing an application's media capabilities XML file

     *

     * For example:

     * <application>

     *   <property android:name="android.media.PROPERTY_MEDIA_CAPABILITIES"

     *     android:resource="@xml/media_capabilities">

     * <application>

     */

    public static final String PROPERTY_MEDIA_CAPABILITIES =

            "android.media.PROPERTY_MEDIA_CAPABILITIES";



    /**

     * A property value set within the manifest.

     * <p>