LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am f02769d6: am 817e1ef4: Merge "Use define for drm property keys instead of defining as char pointers"

Browse Source 
* commit 'f02769d6ba2b06ee6be80315f39b43679e9e905f':
  Use define for drm property keys instead of defining as char pointers
This commit is contained in:
Andrew Hsieh
2015-01-06 00:08:30 +00:00
committed by Android Git Automerger
parent 2f69899132 f02769d6ba
commit 4400c6bec9
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ndk/platforms/android-21/include/media/NdkMediaDrm.h
View File

@@ -327,24 +327,24 @@ media_status_t AMediaDrm_releaseSecureStops(AMediaDrm *,
/** /**
* String property name: identifies the maker of the DRM engine plugin * 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 * 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 * 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 * String property name: a comma-separated list of cipher and mac algorithms
* supported by CryptoSession. The list may be empty if the DRM engine * supported by CryptoSession. The list may be empty if the DRM engine
* plugin does not support CryptoSession operations. * 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. * 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 * Byte array property name: the device unique identifier is established during
* device provisioning and provides a means of uniquely identifying each device. * 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. * Read a DRM engine plugin byte array property value, given the property name string.