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

Commit 4ca5d43f authored by Christopher Ferris's avatar Christopher Ferris Committed by Automerger Merge Worker
Browse files

Merge "Remove unused variables." into main am: 9eca1c5f 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3205618



Change-Id: I1c4e9806c4b19af17e09b55122c650dd3ac38f50
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7ca142e1 9eca1c5f

drm/mediadrm/plugins/clearkey/aidl/DrmPlugin.cpp

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ const int kKeySetIdLength = 16; 
const int kSecureStopIdStart = 100;

const std::string kOfflineLicense("\"type\":\"persistent-license\"");

const std::string kStreaming("Streaming");

const std::string kTemporaryLicense("\"type\":\"temporary\"");

const std::string kTrue("True");



const std::string kQueryKeyLicenseType("LicenseType");

drm/mediadrm/plugins/clearkey/common/JsonWebKey.cpp

+0 −3
Original line number Diff line number Diff line
@@ -27,10 +27,7 @@ const std::string kKeysTag("keys"); 
const std::string kKeyTypeTag("kty");

const std::string kKeyTag("k");

const std::string kKeyIdTag("kid");

const std::string kMediaSessionType("type");

const std::string kPersistentLicenseSession("persistent-license");

const std::string kSymmetricKeyValue("oct");

const std::string kTemporaryLicenseSession("temporary");

}  // namespace



namespace clearkeydrm {

media/codec2/sfplugin/CCodecBufferChannel.cpp

+0 −1
Original line number Diff line number Diff line
@@ -2807,7 +2807,6 @@ void CCodecBufferChannel::setInfoBuffer(const std::shared_ptr<C2InfoBuffer> &buf 
        work->input.infoBuffers.emplace_back(*buffer);

        work->worklets.emplace_back(new C2Worklet);

        items.push_back(std::move(work));

        c2_status_t err = mComponent->queue(&items);

    }

}