widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean Up Warnings in Android Glue Code"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-23 19:52:49 +00:00
committed by Android (Google) Code Review
parent 85365a1497 92d26ff87e
commit 99566d48e9
2 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libwvdrmengine/mediacrypto/src_hidl/WVCryptoPlugin.cpp
View File

@@ -313,18 +313,7 @@ Return<void> WVCryptoPlugin::decrypt(
} }
} }
uint32_t status; _hidl_cb(Status::OK, bufferOffset, errorDetailMsg.c_str());
uint32_t bytesWritten;
if (bufferOffset >= 0) {
status = android::OK;
bytesWritten = bufferOffset;
} else {
status = bufferOffset;
bytesWritten = 0;
}
_hidl_cb(toStatus(status), bytesWritten, errorDetailMsg.c_str());
return Void(); return Void();
} }

8
libwvdrmengine/mediacrypto/test/legacy_src/WVCryptoPlugin_test.cpp
View File

@@ -256,7 +256,7 @@ TEST_F(WVCryptoPluginTest, AttemptsToDecrypt) {
} }
WVCryptoPlugin plugin(sessionId, kSessionIdSize, cdm.get()); WVCryptoPlugin plugin(sessionId, kSessionIdSize, cdm.get());
android::CryptoPlugin::Pattern noPattern = {0}; android::CryptoPlugin::Pattern noPattern = { 0, 0 };
AString errorDetailMessage; AString errorDetailMessage;
ssize_t res = plugin.decrypt(false, keyId, iv[0], CryptoPlugin::kMode_AES_CTR, ssize_t res = plugin.decrypt(false, keyId, iv[0], CryptoPlugin::kMode_AES_CTR,
@@ -310,7 +310,7 @@ TEST_F(WVCryptoPluginTest, CommunicatesSecureBufferRequest) {
} }
WVCryptoPlugin plugin(sessionId, kSessionIdSize, cdm.get()); WVCryptoPlugin plugin(sessionId, kSessionIdSize, cdm.get());
android::CryptoPlugin::Pattern noPattern = {0}; android::CryptoPlugin::Pattern noPattern = { 0, 0 };
AString errorDetailMessage; AString errorDetailMessage;
ssize_t res = plugin.decrypt(false, keyId, iv, CryptoPlugin::kMode_AES_CTR, ssize_t res = plugin.decrypt(false, keyId, iv, CryptoPlugin::kMode_AES_CTR,
@@ -385,7 +385,7 @@ TEST_F(WVCryptoPluginTest, SetsFlagsForMinimumSubsampleRuns) {
} }
WVCryptoPlugin plugin(sessionId, kSessionIdSize, cdm.get()); WVCryptoPlugin plugin(sessionId, kSessionIdSize, cdm.get());
android::CryptoPlugin::Pattern noPattern = {0}; android::CryptoPlugin::Pattern noPattern = { 0, 0 };
AString errorDetailMessage; AString errorDetailMessage;
ssize_t res = plugin.decrypt(false, keyId, iv, CryptoPlugin::kMode_AES_CTR, ssize_t res = plugin.decrypt(false, keyId, iv, CryptoPlugin::kMode_AES_CTR,
@@ -461,7 +461,7 @@ TEST_F(WVCryptoPluginTest, AllowsSessionIdChanges) {
uint8_t blank[1]; // Some compilers will not accept 0. uint8_t blank[1]; // Some compilers will not accept 0.
WVCryptoPlugin plugin(blank, 0, cdm.get()); WVCryptoPlugin plugin(blank, 0, cdm.get());
android::CryptoPlugin::Pattern noPattern = {0}; android::CryptoPlugin::Pattern noPattern = { 0, 0 };
AString errorDetailMessage; AString errorDetailMessage;
ssize_t res; ssize_t res;