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

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

Merge "Unhide MediaDrm#getPlaybackComponent" into sc-dev am: e0519c10 

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

Change-Id: Ib6fe054cc763f6db778a83927bd43708ee652854
parents 3e324443 e0519c10

core/api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -21892,6 +21892,7 @@ package android.media { 
    method @NonNull public java.util.List<byte[]> getOfflineLicenseKeySetIds();

    method @NonNull public java.util.List<byte[]> getOfflineLicenseKeySetIds();

    method public int getOfflineLicenseState(@NonNull byte[]);

    method public int getOfflineLicenseState(@NonNull byte[]);

    method public int getOpenSessionCount();

    method public int getOpenSessionCount();

    method @Nullable public android.media.metrics.PlaybackComponent getPlaybackComponent(@NonNull byte[]);

    method @NonNull public byte[] getPropertyByteArray(String);

    method @NonNull public byte[] getPropertyByteArray(String);

    method @NonNull public String getPropertyString(@NonNull String);

    method @NonNull public String getPropertyString(@NonNull String);

    method @NonNull public android.media.MediaDrm.ProvisionRequest getProvisionRequest();

    method @NonNull public android.media.MediaDrm.ProvisionRequest getProvisionRequest();

core/api/test-current.txt

+0 −4
Original line number Original line Diff line number Diff line
@@ -1380,10 +1380,6 @@ package android.media { 
    method public int getMaxMacroBlocks();

    method public int getMaxMacroBlocks();

  }

  }





  public final class MediaDrm implements java.lang.AutoCloseable {

    method @Nullable public android.media.metrics.PlaybackComponent getPlaybackComponent(@NonNull byte[]);

  }



  public final class MediaRoute2Info implements android.os.Parcelable {

  public final class MediaRoute2Info implements android.os.Parcelable {

    method @NonNull public String getOriginalId();

    method @NonNull public String getOriginalId();

  }

  }

media/java/android/media/MediaDrm.java

+0 −3
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ import android.annotation.IntDef; 
import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.StringDef;

import android.annotation.StringDef;

import android.annotation.TestApi;

import android.app.ActivityThread;

import android.app.ActivityThread;

import android.app.Application;

import android.app.Application;

import android.compat.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;
@@ -2937,9 +2936,7 @@ public final class MediaDrm implements AutoCloseable { 
     * @return a {@link PlaybackComponent} associated with the session,

     * @return a {@link PlaybackComponent} associated with the session,

     * or {@code null} if the session is closed or does not exist.

     * or {@code null} if the session is closed or does not exist.

     * @see PlaybackComponent

     * @see PlaybackComponent

     * @hide

     */

     */

    @TestApi

    @Nullable

    @Nullable

    public PlaybackComponent getPlaybackComponent(@NonNull byte[] sessionId) {

    public PlaybackComponent getPlaybackComponent(@NonNull byte[] sessionId) {

        if (sessionId == null) {

        if (sessionId == null) {