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

Commit 02c78818 authored by Rahul Frias's avatar Rahul Frias Committed by android-build-merger
Browse files

Merge "Clarified app behavior on REQUEST_TYPE_NONE" into pi-dev 

am: 1b7162ad

Change-Id: I58f01676399514276b18d633bce4638dc179b66c
parents d3b9df79 1b7162ad

media/java/android/media/MediaDrm.java

+5 −3
Original line number Diff line number Diff line
@@ -705,7 +705,9 @@ public final class MediaDrm implements AutoCloseable { 
    public @interface KeyType {}



    /**

     * Contains the opaque data an app uses to request keys from a license server

     * Contains the opaque data an app uses to request keys from a license server.

     * These request types may or may not be generated by a given plugin. Refer

     * to plugin vendor documentation for more information.

     */

    public static final class KeyRequest {

        private byte[] mData;
@@ -730,8 +732,8 @@ public final class MediaDrm implements AutoCloseable { 
        public static final int REQUEST_TYPE_RELEASE = 2;



        /**

         * Keys are already loaded. No license request is necessary, and no

         * key request data is returned.

         * Keys are already loaded and are available for use. No license request is necessary, and

         * no key request data is returned.

         */

        public static final int REQUEST_TYPE_NONE = 3;