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

Merge "Fix exception message string formatting in MediaDrm" into lmp-dev

Browse Source
This commit is contained in:
Jeff Tinker
2014-08-29 01:45:23 +00:00
committed by Android (Google) Code Review
parent 85933eb18b 2979986b57
commit 67085e1cac
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/jni/android_media_MediaDrm.cpp
View File

@@ -263,7 +263,7 @@ static bool throwExceptionAsNecessary(
String8 vendorMessage;
if (err >= ERROR_DRM_VENDOR_MIN && err <= ERROR_DRM_VENDOR_MAX) {
vendorMessage.format("DRM vendor-defined error: %d", err);
vendorMessage = String8::format("DRM vendor-defined error: %d", err);
drmMessage = vendorMessage.string();
}
@@ -285,7 +285,7 @@ static bool throwExceptionAsNecessary(
if (msg == NULL) {
msg = drmMessage;
} else {
errbuf.format("%s: %s", msg, drmMessage);
errbuf = String8::format("%s: %s", msg, drmMessage);
msg = errbuf.string();
}
}