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

Commit 2f583c0a authored by Jeff Tinker's avatar Jeff Tinker Committed by Android (Google) Code Review
Browse files

Merge "Adds a drm resource busy error, removes some deprecated errors"

parents 89a70f71 362552a5

include/media/stagefright/MediaErrors.h

+1 −4
Original line number Diff line number Diff line
@@ -56,14 +56,11 @@ enum { 
    ERROR_DRM_TAMPER_DETECTED               = DRM_ERROR_BASE - 7,

    ERROR_DRM_NOT_PROVISIONED               = DRM_ERROR_BASE - 8,

    ERROR_DRM_DEVICE_REVOKED                = DRM_ERROR_BASE - 9,

    ERROR_DRM_RESOURCE_BUSY                 = DRM_ERROR_BASE - 10,



    ERROR_DRM_VENDOR_MAX                    = DRM_ERROR_BASE - 500,

    ERROR_DRM_VENDOR_MIN                    = DRM_ERROR_BASE - 999,



    // Deprecated

    ERROR_DRM_WV_VENDOR_MAX                 = ERROR_DRM_VENDOR_MAX,

    ERROR_DRM_WV_VENDOR_MIN                 = ERROR_DRM_VENDOR_MIN,



    // Heartbeat Error Codes

    HEARTBEAT_ERROR_BASE = -3000,

    ERROR_HEARTBEAT_TERMINATE_REQUESTED                     = HEARTBEAT_ERROR_BASE,