Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Respond to API Review comments on MediaDrm" into sc-dev am: b95a39d891

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

Change-Id: Ie569416a537442dfd15289a299cdf5d1bde5fc9a
This commit is contained in:
Robert Shih
2021-04-06 21:30:32 +00:00
committed by Automerger Merge Worker
parent 595912707d b95a39d891
commit 7d9acfbb40
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/api/current.txt
View File

@@ -22253,10 +22253,10 @@ package android.media {
field public static final int STATUS_USABLE_IN_FUTURE = 5; // 0x5
}
public static class MediaDrm.LogMessage {
field @NonNull public final String message;
field public final int priority;
field public final long timestampMillis;
public static final class MediaDrm.LogMessage {
method @NonNull public String getMessage();
method public int getPriority();
method public long getTimestampMillis();
}
public static final class MediaDrm.MediaDrmStateException extends java.lang.IllegalStateException {

11
media/java/android/media/MediaDrm.java
View File

@@ -2991,13 +2991,16 @@ public final class MediaDrm implements AutoCloseable {
* A {@link LogMessage} records an event in the {@link MediaDrm} framework
* or vendor plugin.
*/
public static class LogMessage {
public static final class LogMessage {
private final long timestampMillis;
private final int priority;
private final String message;
/**
* Timing of the recorded event measured in milliseconds since the Epoch,
* 1970-01-01 00:00:00 +0000 (UTC).
*/
public final long timestampMillis;
public final long getTimestampMillis() { return timestampMillis; }
/**
* Priority of the recorded event.
@@ -3013,13 +3016,13 @@ public final class MediaDrm implements AutoCloseable {
* </ul>
*/
@Log.Level
public final int priority;
public final int getPriority() { return priority; }
/**
* Description of the recorded event.
*/
@NonNull
public final String message;
public final String getMessage() { return message; }
private LogMessage(long timestampMillis, int priority, String message) {
this.timestampMillis = timestampMillis;