diff options
| author | Robert Shih <robertshih@google.com> | 2019-05-28 18:44:19 -0700 |
|---|---|---|
| committer | Robert Shih <robertshih@google.com> | 2019-05-28 18:51:31 -0700 |
| commit | 494fb48e6ee46f34d129f2c0c93c585036164f0f (patch) | |
| tree | 9f1ad017952b5ee19b0f4ec7bd5fbb4b60189419 /drm | |
| parent | 9eef0acf2e05ff75a25a0cfd64340bf5db444ac6 (diff) | |
| download | frameworks_av-494fb48e6ee46f34d129f2c0c93c585036164f0f.tar.gz frameworks_av-494fb48e6ee46f34d129f2c0c93c585036164f0f.tar.bz2 frameworks_av-494fb48e6ee46f34d129f2c0c93c585036164f0f.zip | |
clearkey hidl: mock USABLEINFUTURE
Bug: 116738851
Test: android.media.cts.MediaDrmMockTest#testKeyStatusChange
Change-Id: Icf91e4009832ff8795675840bda1f4fe06623874
Diffstat (limited to 'drm')
| -rw-r--r-- | drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp b/drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp index d7dacb8a68..d74bc53d8b 100644 --- a/drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp +++ b/drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp @@ -401,20 +401,25 @@ Return<void> DrmPlugin::provideKeyResponse( sendExpirationUpdate(sessionId, 100); - std::vector<KeyStatus> keysStatus; - KeyStatus keyStatus; + std::vector<KeyStatus_V1_2> keysStatus; + KeyStatus_V1_2 keyStatus; std::vector<uint8_t> keyId1 = { 0xA, 0xB, 0xC }; keyStatus.keyId = keyId1; - keyStatus.type = V1_0::KeyStatusType::USABLE; + keyStatus.type = V1_2::KeyStatusType::USABLE; keysStatus.push_back(keyStatus); std::vector<uint8_t> keyId2 = { 0xD, 0xE, 0xF }; keyStatus.keyId = keyId2; - keyStatus.type = V1_0::KeyStatusType::EXPIRED; + keyStatus.type = V1_2::KeyStatusType::EXPIRED; keysStatus.push_back(keyStatus); - sendKeysChange(sessionId, keysStatus, true); + std::vector<uint8_t> keyId3 = { 0x0, 0x1, 0x2 }; + keyStatus.keyId = keyId3; + keyStatus.type = V1_2::KeyStatusType::USABLEINFUTURE; + keysStatus.push_back(keyStatus); + + sendKeysChange_1_2(sessionId, keysStatus, true); installSecureStop(sessionId); } else { |