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

Commit b95a39d8 authored by Robert Shih's avatar Robert Shih Committed by Android (Google) Code Review
Browse files

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

parents 7972c833 ad9da4c4
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -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 {
+7 −4
Original line number Diff line number Diff line
@@ -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;