Update Widevine HIDL service to 1.2.
Widevine HIDL service added new v1.2 media APIs, update the service to support new APIs. Merged from http://go/wvgerrit/67083 Test: Netflix and Play Movies & TV (streaming and offline playback) Test: GTS WidevineH264PlaybackTests test e.g. ANDROID_BUILD_TOP= ./android-gts/toolsefed run gts -m GtsMediaTestCases --test com.google.android.media.gts.WidevineH264PlaybackTests#testL1With480P30 Test: Widevine unit tests bug: 117570686 Change-Id: I3a2091e7c62a0d2697ef97f983fd898aedfb4519
This commit is contained in:
@@ -35,7 +35,7 @@ static const char* const kSpecialUnprovisionResponse = "unprovision";
|
||||
namespace wvdrm {
|
||||
namespace hardware {
|
||||
namespace drm {
|
||||
namespace V1_1 {
|
||||
namespace V1_2 {
|
||||
namespace widevine {
|
||||
|
||||
using ::android::hardware::drm::V1_0::EventType;
|
||||
@@ -45,8 +45,8 @@ using ::android::hardware::drm::V1_0::KeyType;
|
||||
using ::android::hardware::drm::V1_0::Status;
|
||||
using ::android::hardware::drm::V1_1::DrmMetricGroup;
|
||||
using ::android::hardware::drm::V1_1::SecurityLevel;
|
||||
using ::android::hardware::drm::V1_1::widevine::toHidlVec;
|
||||
using ::android::hardware::drm::V1_1::widevine::toVector;
|
||||
using ::android::hardware::drm::V1_2::widevine::toHidlVec;
|
||||
using ::android::hardware::drm::V1_2::widevine::toVector;
|
||||
using ::android::hardware::Void;
|
||||
|
||||
using wvcdm::kDefaultCdmIdentifier;
|
||||
@@ -937,6 +937,33 @@ Return<void> WVDrmPlugin::getSecurityLevel(
|
||||
return Void();
|
||||
}
|
||||
|
||||
Return<void> WVDrmPlugin::getOfflineLicenseKeySetIds(
|
||||
getOfflineLicenseKeySetIds_cb _hidl_cb) {
|
||||
std::vector<KeySetId> keySetIds;
|
||||
|
||||
_hidl_cb(Status::ERROR_DRM_CANNOT_HANDLE, keySetIds);
|
||||
return Void();
|
||||
}
|
||||
|
||||
Return<void> WVDrmPlugin::getOfflineLicenseState(const KeySetId &keySetId,
|
||||
getOfflineLicenseState_cb _hidl_cb) {
|
||||
if (!keySetId.size()) {
|
||||
_hidl_cb(Status::BAD_VALUE, OfflineLicenseState::UNKNOWN);
|
||||
return Void();
|
||||
}
|
||||
|
||||
_hidl_cb(Status::ERROR_DRM_CANNOT_HANDLE, OfflineLicenseState::UNKNOWN);
|
||||
return Void();
|
||||
}
|
||||
|
||||
Return<Status> WVDrmPlugin::removeOfflineLicense(const KeySetId &keySetId) {
|
||||
if (!keySetId.size()) {
|
||||
return Status::BAD_VALUE;
|
||||
}
|
||||
|
||||
return Status::ERROR_DRM_CANNOT_HANDLE;
|
||||
}
|
||||
|
||||
Return<void> WVDrmPlugin::getPropertyString(const hidl_string& propertyName,
|
||||
getPropertyString_cb _hidl_cb) {
|
||||
Status status = Status::OK;
|
||||
@@ -1793,7 +1820,7 @@ uint32_t WVDrmPlugin::CdmIdentifierBuilder::getNextUniqueId() {
|
||||
}
|
||||
|
||||
} // namespace widevine
|
||||
} // namespace V1_1
|
||||
} // namespace V1_2
|
||||
} // namespace drm
|
||||
} // namespace hardware
|
||||
} // namespace wvdrm
|
||||
|
||||
Reference in New Issue
Block a user