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

Commit 8ef5c3d2 authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by Gerrit Code Review
Browse files

Merge "Fix compiler warnings."

parents b50a7dcd b0a0235b

drm/mediacas/plugins/clearkey/JsonAssetLoader.cpp

+0 −2
Original line number Original line Diff line number Diff line
@@ -36,8 +36,6 @@ const String8 kEncryptionKeyTag("encryption_key"); 
const String8 kCasTypeTag("cas_type");

const String8 kCasTypeTag("cas_type");

const String8 kBase64Padding("=");

const String8 kBase64Padding("=");





const uint32_t kKeyLength = 16;



JsonAssetLoader::JsonAssetLoader() {

JsonAssetLoader::JsonAssetLoader() {

}

}

drm/mediacas/plugins/clearkey/ecm_generator.cpp

+0 −2
Original line number Original line Diff line number Diff line
@@ -38,8 +38,6 @@ const uint32_t kContentKeyByteSize = 16; 
const uint16_t kTotalEcmSize =

const uint16_t kTotalEcmSize =

        kEcmClearFieldsSize + kContentKeyByteSize; // clear fields + clear key

        kEcmClearFieldsSize + kContentKeyByteSize; // clear fields + clear key





const uint32_t kKeyLength = 16;



#define UNALIGNED_LOAD32(_p) (*reinterpret_cast<const uint32_t *>(_p))

#define UNALIGNED_LOAD32(_p) (*reinterpret_cast<const uint32_t *>(_p))





static uint32_t Load32(const void *p) {

static uint32_t Load32(const void *p) {

drm/mediacas/plugins/clearkey/tests/ClearKeyFetcherTest.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -93,7 +93,7 @@ TEST_F(ClearKeyFetcherTest, Success) { 
    uint64_t asset_id;

    uint64_t asset_id;

    std::vector<KeyFetcher::KeyInfo> keys;

    std::vector<KeyFetcher::KeyInfo> keys;

    EXPECT_EQ(OK, fetcher.ObtainKey(ecm_, &asset_id, &keys));

    EXPECT_EQ(OK, fetcher.ObtainKey(ecm_, &asset_id, &keys));

    EXPECT_EQ(2, keys.size());

    EXPECT_EQ(2U, keys.size());

    EXPECT_EQ(0, keys[0].key_id);

    EXPECT_EQ(0, keys[0].key_id);

    EXPECT_EQ(content_key_[0]->size(), keys[0].key_bytes->size());

    EXPECT_EQ(content_key_[0]->size(), keys[0].key_bytes->size());

    EXPECT_EQ(0, memcmp(content_key_[0]->data(),

    EXPECT_EQ(0, memcmp(content_key_[0]->data(),

drm/mediacas/plugins/mock/MockCasPlugin.cpp

+7 −7
Original line number Original line Diff line number Diff line
@@ -49,8 +49,8 @@ status_t MockCasFactory::queryPlugins( 




status_t MockCasFactory::createPlugin(

status_t MockCasFactory::createPlugin(

        int32_t CA_system_id,

        int32_t CA_system_id,

        uint64_t appData,

        uint64_t /*appData*/,

        CasPluginCallback callback,

        CasPluginCallback /*callback*/,

        CasPlugin **plugin) {

        CasPlugin **plugin) {

    if (!isSystemIdSupported(CA_system_id)) {

    if (!isSystemIdSupported(CA_system_id)) {

        return BAD_VALUE;

        return BAD_VALUE;
@@ -98,7 +98,7 @@ MockCasPlugin::~MockCasPlugin() { 
    MockSessionLibrary::get()->destroyPlugin(this);

    MockSessionLibrary::get()->destroyPlugin(this);

}

}





status_t MockCasPlugin::setPrivateData(const CasData &data) {

status_t MockCasPlugin::setPrivateData(const CasData& /*data*/) {

    ALOGV("setPrivateData");

    ALOGV("setPrivateData");

    return OK;

    return OK;

}

}
@@ -123,7 +123,7 @@ status_t MockCasPlugin::closeSession(const CasSessionId &sessionId) { 
}

}





status_t MockCasPlugin::setSessionPrivateData(

status_t MockCasPlugin::setSessionPrivateData(

        const CasSessionId &sessionId, const CasData &data) {

        const CasSessionId &sessionId, const CasData& /*data*/) {

    ALOGV("setSessionPrivateData: sessionId=%s",

    ALOGV("setSessionPrivateData: sessionId=%s",

            arrayToString(sessionId).string());

            arrayToString(sessionId).string());

    Mutex::Autolock lock(mLock);

    Mutex::Autolock lock(mLock);
@@ -163,7 +163,7 @@ status_t MockCasPlugin::processEmm(const CasEmm& emm) { 
}

}





status_t MockCasPlugin::sendEvent(

status_t MockCasPlugin::sendEvent(

        int32_t event, int arg, const CasData &eventData) {

        int32_t event, int /*arg*/, const CasData& /*eventData*/) {

    ALOGV("sendEvent: event=%d", event);

    ALOGV("sendEvent: event=%d", event);

    Mutex::Autolock lock(mLock);

    Mutex::Autolock lock(mLock);
@@ -178,7 +178,7 @@ status_t MockCasPlugin::provision(const String8 &str) { 
}

}





status_t MockCasPlugin::refreshEntitlements(

status_t MockCasPlugin::refreshEntitlements(

        int32_t refreshType, const CasData &refreshData) {

        int32_t /*refreshType*/, const CasData &refreshData) {

    ALOGV("refreshEntitlements: refreshData=%s", arrayToString(refreshData).string());

    ALOGV("refreshEntitlements: refreshData=%s", arrayToString(refreshData).string());

    Mutex::Autolock lock(mLock);

    Mutex::Autolock lock(mLock);
@@ -216,7 +216,7 @@ ssize_t MockDescramblerPlugin::descramble( 
        int32_t srcOffset,

        int32_t srcOffset,

        void *dstPtr,

        void *dstPtr,

        int32_t dstOffset,

        int32_t dstOffset,

        AString *errorDetailMsg) {

        AString* /*errorDetailMsg*/) {

    ALOGV("MockDescramblerPlugin::descramble(secure=%d, sctrl=%d,"

    ALOGV("MockDescramblerPlugin::descramble(secure=%d, sctrl=%d,"

          "subSamples=%s, srcPtr=%p, dstPtr=%p, srcOffset=%d, dstOffset=%d)",

          "subSamples=%s, srcPtr=%p, dstPtr=%p, srcOffset=%d, dstOffset=%d)",

          (int)secure, (int)scramblingControl,

          (int)secure, (int)scramblingControl,