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

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

Merge "frameworks/av/media portion of removing YouTube specific error codes"

parents a4c5a550 8f883be3

include/media/stagefright/MediaErrors.h

+4 −8
Original line number Diff line number Diff line
@@ -55,16 +55,12 @@ enum { 
    ERROR_DRM_CANNOT_HANDLE                 = DRM_ERROR_BASE - 6,

    ERROR_DRM_TAMPER_DETECTED               = DRM_ERROR_BASE - 7,



    ERROR_DRM_WV_VENDOR_MAX                 = DRM_ERROR_BASE - 500,

    ERROR_DRM_WV_VENDOR_MIN                 = DRM_ERROR_BASE - 999,



    // Heartbeat Error Codes

    HEARTBEAT_ERROR_BASE = -3000,



    ERROR_HEARTBEAT_AUTHENTICATION_FAILURE                  = HEARTBEAT_ERROR_BASE,

    ERROR_HEARTBEAT_NO_ACTIVE_PURCHASE_AGREEMENT            = HEARTBEAT_ERROR_BASE - 1,

    ERROR_HEARTBEAT_CONCURRENT_PLAYBACK                     = HEARTBEAT_ERROR_BASE - 2,

    ERROR_HEARTBEAT_UNUSUAL_ACTIVITY                        = HEARTBEAT_ERROR_BASE - 3,

    ERROR_HEARTBEAT_STREAMING_UNAVAILABLE                   = HEARTBEAT_ERROR_BASE - 4,

    ERROR_HEARTBEAT_CANNOT_ACTIVATE_RENTAL                  = HEARTBEAT_ERROR_BASE - 5,

    ERROR_HEARTBEAT_TERMINATE_REQUESTED                     = HEARTBEAT_ERROR_BASE - 6,

    ERROR_HEARTBEAT_TERMINATE_REQUESTED                     = HEARTBEAT_ERROR_BASE,

};



}  // namespace android