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

Commit 469a1a53 authored by Andreas Gampe's avatar Andreas Gampe Committed by Android Git Automerger
Browse files

am 37fcecde: am 827909fc: Merge "Frameworks/base: Wall Werror in drm" 

* commit '37fcecde':
  Frameworks/base: Wall Werror in drm
parents aab09664 37fcecde

drm/jni/Android.mk

+2 −2
Original line number Original line Diff line number Diff line
@@ -39,8 +39,8 @@ LOCAL_C_INCLUDES += \ 
    $(TOP)/frameworks/av/include \

    $(TOP)/frameworks/av/include \

    $(TOP)/libcore/include

    $(TOP)/libcore/include









LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_TAGS := optional





LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code



include $(BUILD_SHARED_LIBRARY)
 
include $(BUILD_SHARED_LIBRARY)

drm/jni/android_drm_DrmManagerClient.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -381,7 +381,8 @@ static jobjectArray android_drm_DrmManagerClient_getAllSupportInfo( 
}

}





static void android_drm_DrmManagerClient_installDrmEngine(

static void android_drm_DrmManagerClient_installDrmEngine(

            JNIEnv* env, jobject thiz, jint uniqueId, jstring engineFilePath) {

            JNIEnv* /* env */, jobject /* thiz */, jint /* uniqueId */,

            jstring /* engineFilePath */) {

    ALOGV("installDrmEngine - Enter");

    ALOGV("installDrmEngine - Enter");

    //getDrmManagerClient(env, thiz)

    //getDrmManagerClient(env, thiz)

    //  ->installDrmEngine(uniqueId, Utility::getStringValue(env, engineFilePath));

    //  ->installDrmEngine(uniqueId, Utility::getStringValue(env, engineFilePath));
@@ -776,7 +777,7 @@ static int registerNativeMethods(JNIEnv* env) { 
    return result;

    return result;

}

}





jint JNI_OnLoad(JavaVM* vm, void* reserved) {

jint JNI_OnLoad(JavaVM* vm, void* /* reserved */) {

    JNIEnv* env = NULL;

    JNIEnv* env = NULL;

    jint result = -1;

    jint result = -1;