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

Commit 207cffe9 authored by Andreas Gampe's avatar Andreas Gampe Committed by Gerrit Code Review
Browse files

Merge "Frameworks/base: Fix services/jni warnings"

parents d7baaed8 26872f4b

services/jni/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ LOCAL_SHARED_LIBRARIES := \ 
    libEGL \

    libGLESv2



LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES -DGL_GLEXT_PROTOTYPES

LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES -DGL_GLEXT_PROTOTYPES -Wall -Werror



LOCAL_MODULE:= libandroid_servers

services/jni/com_android_server_AssetAtlasService.cpp

+4 −0
Original line number Diff line number Diff line
@@ -28,8 +28,12 @@ 
#include <EGL/egl.h>

#include <EGL/eglext.h>



// Disable warnings for Skia.

#pragma GCC diagnostic push

#pragma GCC diagnostic ignored "-Wunused-parameter"

#include <SkCanvas.h>

#include <SkBitmap.h>

#pragma GCC diagnostic pop



namespace android {

services/jni/com_android_server_ConsumerIrService.cpp

+3 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 


namespace android {



static jlong halOpen(JNIEnv *env, jobject obj) {

static jlong halOpen(JNIEnv* /* env */, jobject /* obj */) {

    hw_module_t const* module;

    consumerir_device_t *dev;

    int err;
@@ -50,7 +50,7 @@ static jlong halOpen(JNIEnv *env, jobject obj) { 
    return reinterpret_cast<jlong>(dev);

}



static jint halTransmit(JNIEnv *env, jobject obj, jlong halObject,

static jint halTransmit(JNIEnv *env, jobject /* obj */, jlong halObject,

   jint carrierFrequency, jintArray pattern) {

    int ret;
@@ -66,7 +66,7 @@ static jint halTransmit(JNIEnv *env, jobject obj, jlong halObject, 
    return reinterpret_cast<jint>(ret);

}



static jintArray halGetCarrierFrequencies(JNIEnv *env, jobject obj,

static jintArray halGetCarrierFrequencies(JNIEnv *env, jobject /* obj */,

    jlong halObject) {

    consumerir_device_t *dev = reinterpret_cast<consumerir_device_t*>(halObject);

    consumerir_freq_range_t *ranges;

services/jni/com_android_server_LightsService.cpp

+3 −3
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static light_device_t* get_device(hw_module_t* module, char const* name) 
    }

}



static jlong init_native(JNIEnv *env, jobject clazz)

static jlong init_native(JNIEnv* /* env */, jobject /* clazz */)

{

    int err;

    hw_module_t* module;
@@ -93,7 +93,7 @@ static jlong init_native(JNIEnv *env, jobject clazz) 
    return (jlong)devices;

}



static void finalize_native(JNIEnv *env, jobject clazz, jlong ptr)

static void finalize_native(JNIEnv* /* env */, jobject /* clazz */, jlong ptr)

{

    Devices* devices = (Devices*)ptr;

    if (devices == NULL) {
@@ -103,7 +103,7 @@ static void finalize_native(JNIEnv *env, jobject clazz, jlong ptr) 
    free(devices);

}



static void setLight_native(JNIEnv *env, jobject clazz, jlong ptr,

static void setLight_native(JNIEnv* /* env */, jobject /* clazz */, jlong ptr,

        jint light, jint colorARGB, jint flashMode, jint onMS, jint offMS, jint brightnessMode)

{

    Devices* devices = (Devices*)ptr;

services/jni/com_android_server_SerialService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static struct parcel_file_descriptor_offsets_t 
    jmethodID mConstructor;

} gParcelFileDescriptorOffsets;



static jobject android_server_SerialService_open(JNIEnv *env, jobject thiz, jstring path)

static jobject android_server_SerialService_open(JNIEnv *env, jobject /* thiz */, jstring path)

{

    const char *pathStr = env->GetStringUTFChars(path, NULL);