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

Commit 6c4cd643 authored by Robert Shih's avatar Robert Shih Committed by Automerger Merge Worker
Browse files

Merge "Fix MediaDrm.PlaybackComponent#setLogSessionId doc" am: a20d36c0 am:... 

Merge "Fix MediaDrm.PlaybackComponent#setLogSessionId doc" am: a20d36c0 am: 5a297d5d am: dd7364cd

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



Change-Id: I62c714a56b2672173f8b48695090148a58355f96
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 189d4f92 dd7364cd

media/java/android/media/MediaDrm.java

+7 −1
Original line number Diff line number Diff line
@@ -3049,7 +3049,13 @@ public final class MediaDrm implements AutoCloseable { 




        /**

         * Gets the {@link LogSessionId}.

         * Sets the {@link LogSessionId}.

         *

         * <p>The implementation of this method varies by DRM provider; Please refer

         * to your DRM provider documentation for more details on this method.

         *

         * @throws UnsupportedOperationException when the vendor plugin does not

         * implement this method

         */

        public void setLogSessionId(@NonNull LogSessionId logSessionId) {

            Objects.requireNonNull(logSessionId);