Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51281663 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android Git Automerger
Browse files

am 69897ae4: am 75afcc1f: Merge "Use define for drm property keys instead of... 

am 69897ae4: am 75afcc1f: Merge "Use define for drm property keys instead of defining as char pointers"

* commit '69897ae4':
  Use define for drm property keys instead of defining as char pointers
parents 991aa3a7 69897ae4

include/ndk/NdkMediaDrm.h

+5 −5
Original line number Diff line number Diff line
@@ -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.