diff options
| -rw-r--r-- | drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp | 3 | ||||
| -rw-r--r-- | drm/mediadrm/plugins/clearkey/hidl/include/ClearKeyDrmProperties.h | 4 | ||||
| -rw-r--r-- | media/ndk/NdkMediaDrm.cpp | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp b/drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp index 3b6108526b..d04d97648d 100644 --- a/drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp +++ b/drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp @@ -346,6 +346,9 @@ Return<Status> DrmPlugin::setPropertyByteArray( if (name == kDeviceIdKey) { ALOGD("Cannot set immutable property: %s", name.c_str()); return Status::BAD_VALUE; + } else if (name == kClientIdKey) { + mByteArrayProperties[kClientIdKey] = toVector(value); + return Status::OK; } // Setting of undefined properties is not supported diff --git a/drm/mediadrm/plugins/clearkey/hidl/include/ClearKeyDrmProperties.h b/drm/mediadrm/plugins/clearkey/hidl/include/ClearKeyDrmProperties.h index d65b25c37f..cad9222dd4 100644 --- a/drm/mediadrm/plugins/clearkey/hidl/include/ClearKeyDrmProperties.h +++ b/drm/mediadrm/plugins/clearkey/hidl/include/ClearKeyDrmProperties.h @@ -40,6 +40,10 @@ static const std::string kDeviceIdKey("deviceId"); static const uint8_t kTestDeviceIdData[] = {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf}; + +// settable byte array property +static const std::string kClientIdKey("clientId"); + // TODO stub out metrics for nw static const std::string kMetricsKey("metrics"); static const uint8_t kMetricsData[] = { 0 }; diff --git a/media/ndk/NdkMediaDrm.cpp b/media/ndk/NdkMediaDrm.cpp index 2552073324..55afb33803 100644 --- a/media/ndk/NdkMediaDrm.cpp +++ b/media/ndk/NdkMediaDrm.cpp @@ -698,7 +698,7 @@ media_status_t AMediaDrm_setPropertyByteArray(AMediaDrm *mObj, Vector<uint8_t> byteArray; byteArray.appendArray(value, valueSize); - return translateStatus(mObj->mDrm->getPropertyByteArray(String8(propertyName), + return translateStatus(mObj->mDrm->setPropertyByteArray(String8(propertyName), byteArray)); } |