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

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

Browse Source 
* commit '064b5a295cb3964b65cea1ac905f9a268dece5b7':
  Implement API review feedback.
This commit is contained in:
Jeff Tinker
2014-09-23 18:05:11 +00:00
committed by Android Git Automerger
parent f775c39f6e fcaa697a2b
commit 09481f63af
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -14832,7 +14832,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();
}

8
media/java/android/media/MediaCodec.java
View File

@@ -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;

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

@@ -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() {