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

Commit 8a8ac646 authored by Jeff Tinker's avatar Jeff Tinker Committed by Android Git Automerger
Browse files

am 1762f744: am a55b9bcc: am 064b5a29: am cc1ba123: am 3eeac344: Merge... 

am 1762f744: am a55b9bcc: am 064b5a29: am cc1ba123: am 3eeac344: Merge "Implement API review feedback." into lmp-dev

* commit '1762f7449695500670ebb86dd4ab0b3744e448d7':
  Implement API review feedback.
parents 2f712a51 6f77dd84

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -14834,7 +14834,6 @@ package android.media { 
  }















  public static final class MediaDrm.MediaDrmStateException extends java.lang.IllegalStateException {













    ctor public MediaDrm.MediaDrmStateException(int, java.lang.String);















    method public java.lang.String getDiagnosticInfo();















  }







































media/java/android/media/MediaCodec.java



+4
−4




























Original line number
Diff line number
Diff line








@@ -709,10 +709,10 @@ final public class MediaCodec {













        }































        /**













         * Retrieve a human readable diagnostic information string













         * associated with the exception. DO NOT SHOW THIS TO END-USERS!













         * This string will not be localized or generally comprehensible













         * to end-users.













         * Retrieve a developer-readable diagnostic information string













         * associated with the exception. Do not show this to end-users,













         * since this string will not be localized or generally













         * comprehensible to end-users.















         */















        public String getDiagnosticInfo() {















            return mDiagnosticInfo;

































media/java/android/media/MediaDrm.java



+6
−3




























Original line number
Diff line number
Diff line








@@ -190,6 +190,9 @@ public final class MediaDrm {













        private final int mErrorCode;















        private final String mDiagnosticInfo;





























        /**













         * @hide













         */















        public MediaDrmStateException(int errorCode, String detailMessage) {















            super(detailMessage);















            mErrorCode = errorCode;









@@ -211,9 +214,9 @@ public final class MediaDrm {













        }































        /**













         * Retrieve a human readable diagnostic information string













         * associated with the exception. DO NOT SHOW THIS TO END-USERS!













         * This string will not be localized or generally comprehensible













         * Retrieve a developer-readable diagnostic information string













         * associated with the exception. Do not show this to end-users,













         * since this string will not be localized or generally comprehensible















         * to end-users.















         */















        public String getDiagnosticInfo() {