diff options
author | Marco Nelissen <marcone@google.com> | 2015-01-05 17:02:32 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-05 17:02:32 +0000 |
commit | 51281663443ea39db9b4c6e2415343e26a6b3fb8 (patch) | |
tree | 126b2c46af9297178a9204e608d0ba8454f17269 /include | |
parent | 991aa3a70b26c7d9c93361394a43a95355c1c26e (diff) | |
parent | 69897ae4889328807760ea359ee62efffdaca933 (diff) | |
download | frameworks_av-51281663443ea39db9b4c6e2415343e26a6b3fb8.zip frameworks_av-51281663443ea39db9b4c6e2415343e26a6b3fb8.tar.gz frameworks_av-51281663443ea39db9b4c6e2415343e26a6b3fb8.tar.bz2 |
am 69897ae4: am 75afcc1f: Merge "Use define for drm property keys instead of defining as char pointers"
* commit '69897ae4889328807760ea359ee62efffdaca933':
Use define for drm property keys instead of defining as char pointers
Diffstat (limited to 'include')
-rw-r--r-- | include/ndk/NdkMediaDrm.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/ndk/NdkMediaDrm.h b/include/ndk/NdkMediaDrm.h index 10afdd9..3c312a9 100644 --- a/include/ndk/NdkMediaDrm.h +++ b/include/ndk/NdkMediaDrm.h @@ -327,24 +327,24 @@ media_status_t AMediaDrm_releaseSecureStops(AMediaDrm *, /** * String property name: identifies the maker of the DRM engine plugin */ -const char *PROPERTY_VENDOR = "vendor"; +#define PROPERTY_VENDOR "vendor" /** * String property name: identifies the version of the DRM engine plugin */ -const char *PROPERTY_VERSION = "version"; +#define PROPERTY_VERSION "version" /** * String property name: describes the DRM engine plugin */ -const char *PROPERTY_DESCRIPTION = "description"; +#define PROPERTY_DESCRIPTION "description" /** * String property name: a comma-separated list of cipher and mac algorithms * supported by CryptoSession. The list may be empty if the DRM engine * plugin does not support CryptoSession operations. */ -const char *PROPERTY_ALGORITHMS = "algorithms"; +#define PROPERTY_ALGORITHMS "algorithms" /** * Read a DRM engine plugin String property value, given the property name string. @@ -361,7 +361,7 @@ media_status_t AMediaDrm_getPropertyString(AMediaDrm *, const char *propertyName * Byte array property name: the device unique identifier is established during * device provisioning and provides a means of uniquely identifying each device. */ -const char *PROPERTY_DEVICE_UNIQUE_ID = "deviceUniqueId"; +#define PROPERTY_DEVICE_UNIQUE_ID "deviceUniqueId" /** * Read a DRM engine plugin byte array property value, given the property name string. |