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

Commit 67085e1c authored by Jeff Tinker's avatar Jeff Tinker Committed by Android (Google) Code Review
Browse files

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

parents 85933eb1 2979986b

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();

            }

        }