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

Commit 7d334602 authored by Gloria Wang's avatar Gloria Wang Committed by Android (Google) Code Review
Browse files

Merge "Add one more DRM error code. For bug 4422428."

parents 65f47d88 eea8c02b

include/drm/drm_framework_common.h

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ enum { 
    DRM_ERROR_DECRYPT_UNIT_NOT_INITIALIZED  = ERROR_BASE - 4,

    DRM_ERROR_DECRYPT                       = ERROR_BASE - 5,

    DRM_ERROR_CANNOT_HANDLE                 = ERROR_BASE - 6,

    DRM_ERROR_TAMPER_DETECTED               = ERROR_BASE - 7,



    DRM_NO_ERROR                            = NO_ERROR

};

include/media/stagefright/MediaErrors.h

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ enum { 
    ERROR_DRM_DECRYPT_UNIT_NOT_INITIALIZED  = DRM_ERROR_BASE - 4,

    ERROR_DRM_DECRYPT                       = DRM_ERROR_BASE - 5,

    ERROR_DRM_CANNOT_HANDLE                 = DRM_ERROR_BASE - 6,

    ERROR_DRM_TAMPER_DETECTED               = DRM_ERROR_BASE - 7,



    // Heartbeat Error Codes

    HEARTBEAT_ERROR_BASE = -3000,