summaryrefslogtreecommitdiffstats
path: root/include/ndk
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2015-01-05 17:07:44 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-05 17:07:44 +0000
commit7d0fe65b0aa437d62c56653856a7cc79ee373a53 (patch)
treecde95b880f1786dd96da5a09d9ff4232b1504ea1 /include/ndk
parent7e7f3ce6b5e6cafc8187b4c62c3d78cd6064f421 (diff)
parent51281663443ea39db9b4c6e2415343e26a6b3fb8 (diff)
downloadframeworks_av-7d0fe65b0aa437d62c56653856a7cc79ee373a53.zip
frameworks_av-7d0fe65b0aa437d62c56653856a7cc79ee373a53.tar.gz
frameworks_av-7d0fe65b0aa437d62c56653856a7cc79ee373a53.tar.bz2
am 51281663: am 69897ae4: am 75afcc1f: Merge "Use define for drm property keys instead of defining as char pointers"
* commit '51281663443ea39db9b4c6e2415343e26a6b3fb8': Use define for drm property keys instead of defining as char pointers
Diffstat (limited to 'include/ndk')
-rw-r--r--include/ndk/NdkMediaDrm.h10
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.