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

Commit 2419629b authored by Jeff Tinker's avatar Jeff Tinker Committed by Android Git Automerger
Browse files

am d83b4f16: am b8ccb705: Merge "Fix exception message string formatting in MediaDrm" into lmp-dev 

* commit 'd83b4f1660de78738a881623d0bb3e45966fc32d':
  Fix exception message string formatting in MediaDrm
parents 9b7c16ef 1d015f57

media/jni/android_media_MediaDrm.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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();

            }

        }