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

Commit 1deb248c authored by Aurimas Liutikas's avatar Aurimas Liutikas Committed by Android (Google) Code Review
Browse files

Merge "Fix the last warnings in frameworks/av/ drm code." into nyc-dev

parents c8fc4803 c903684e

drm/drmserver/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ LOCAL_C_INCLUDES := \ 
    $(TOP)/frameworks/av/drm/libdrmframework/include \

    $(TOP)/frameworks/av/drm/libdrmframework/plugins/common/include



LOCAL_CFLAGS += -Wall -Wextra -Werror



LOCAL_MODULE:= drmserver



LOCAL_MODULE_TAGS := optional

drm/drmserver/DrmManagerService.cpp

+2 −3
Original line number Diff line number Diff line
@@ -51,8 +51,7 @@ const char *const DrmManagerService::drm_perm_labels[] = { 
const char *DrmManagerService::get_perm_label(drm_perm_t perm) {

    unsigned int index = perm;



    if (index < 0 ||

            index >= (sizeof(drm_perm_labels) / sizeof(drm_perm_labels[0]))) {

    if (index >= (sizeof(drm_perm_labels) / sizeof(drm_perm_labels[0]))) {

        ALOGE("SELinux: Failed to retrieve permission label(perm=%d).\n", perm);

        abort();

    }
@@ -338,7 +337,7 @@ ssize_t DrmManagerService::pread(int uniqueId, DecryptHandle* decryptHandle, 
    return mDrmManager->pread(uniqueId, decryptHandle, buffer, numBytes, offset);

}



status_t DrmManagerService::dump(int fd, const Vector<String16>& args)

status_t DrmManagerService::dump(int fd, const Vector<String16>& /* args */)

{

    const size_t SIZE = 256;

    char buffer[SIZE];

services/mediadrm/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ LOCAL_SHARED_LIBRARIES:= \ 
LOCAL_C_INCLUDES := \

    frameworks/av/media/libmediaplayerservice \



LOCAL_CFLAGS += -Wall -Wextra -Werror



LOCAL_MODULE:= mediadrmserver

LOCAL_32_BIT_ONLY := true

services/mediadrm/main_mediadrmserver.cpp

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 


using namespace android;



int main(int argc __unused, char** argv)

int main()

{

    signal(SIGPIPE, SIG_IGN);