Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused variables and functions, don't warn about unused parameters

Browse Source 
Remove unused variables and static functions clang complains about,
disable warnings about unused parameters (needed for clang and for gcc
with -Wextra enabled)

Change-Id: I76a22cd0158b3c7375c54e3d4d15bc1ac448591e
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
This commit is contained in:
Bernhard Rosenkränzer
2014-11-23 22:24:32 +01:00
parent ff4dd15cd0
commit 4048a4bcb1
10 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/jni/android_nio_utils.h
View File

@@ -58,9 +58,9 @@ class AutoBufferPointer {
public:
AutoBufferPointer(JNIEnv* env, jobject nioBuffer, jboolean commit);
~AutoBufferPointer();
void* pointer() const { return fPointer; }
private:
JNIEnv* fEnv;
void* fPointer;

2
media/jni/android_media_MediaPlayer.cpp
View File

@@ -895,8 +895,6 @@ static JNINativeMethod gMethods[] = {
{"setNextMediaPlayer", "(Landroid/media/MediaPlayer;)V", (void *)android_media_MediaPlayer_setNextMediaPlayer},
};
static const char* const kClassPathName = "android/media/MediaPlayer";
// This function only registers the native methods
static int register_android_media_MediaPlayer(JNIEnv *env)
{

2
media/jni/android_media_MediaRecorder.cpp
View File

@@ -509,8 +509,6 @@ static JNINativeMethod gMethods[] = {
{"native_finalize", "()V", (void *)android_media_MediaRecorder_native_finalize},
};
static const char* const kClassPathName = "android/media/MediaRecorder";
// This function only registers the native methods, and is called from
// JNI_OnLoad in android_media_MediaPlayer.cpp
int register_android_media_MediaRecorder(JNIEnv *env)

2
media/jni/android_mtp_MtpDatabase.cpp
View File

@@ -1174,8 +1174,6 @@ static JNINativeMethod gMtpPropertyGroupMethods[] = {
(void *)android_mtp_MtpPropertyGroup_format_date_time},
};
static const char* const kClassPathName = "android/mtp/MtpDatabase";
int register_android_mtp_MtpDatabase(JNIEnv *env)
{
jclass clazz;

2
media/jni/android_mtp_MtpDevice.cpp
View File

@@ -417,8 +417,6 @@ static JNINativeMethod gMethods[] = {
(void *)android_mtp_MtpDevice_import_file},
};
static const char* const kClassPathName = "android/mtp/MtpDevice";
int register_android_mtp_MtpDevice(JNIEnv *env)
{
jclass clazz;

2
media/jni/android_mtp_MtpServer.cpp
View File

@@ -193,8 +193,6 @@ static JNINativeMethod gMethods[] = {
{"native_remove_storage", "(I)V", (void *)android_mtp_MtpServer_remove_storage},
};
static const char* const kClassPathName = "android/mtp/MtpServer";
int register_android_mtp_MtpServer(JNIEnv *env)
{
jclass clazz;

7
media/mca/filterfw/native/core/shader_program.cpp
View File

@@ -30,9 +30,6 @@
namespace android {
namespace filterfw {
// VBO attachment keys
static const int kDefaultVboKey = 1;
static const char* s_default_vertex_shader_source_ =
"attribute vec4 a_position;\n"
"attribute vec2 a_texcoord;\n"
@@ -55,10 +52,6 @@ static void GetTileCoords(const float* b, float x, float y, float* xt, float* yt
*yt = w0 * b[1] + w1 * b[3] + w2 * b[5] + w3 * b[7];
}
static inline float AdjustRatio(float current, float next) {
return (current + next) / 2.0;
}
// VertexAttrib implementation /////////////////////////////////////////////////
ShaderProgram::VertexAttrib::VertexAttrib()
: is_const(true),

2
services/core/jni/Android.mk
View File

@@ -2,7 +2,7 @@
# files
LOCAL_REL_DIR := core/jni
LOCAL_CFLAGS += -Wall -Werror
LOCAL_CFLAGS += -Wall -Werror -Wno-unused-parameter
LOCAL_SRC_FILES += \
$(LOCAL_REL_DIR)/com_android_server_AlarmManagerService.cpp \

1
services/core/jni/com_android_server_hdmi_HdmiCecController.cpp
View File

@@ -408,6 +408,7 @@ static JNINativeMethod sMethods[] = {
int register_android_server_hdmi_HdmiCecController(JNIEnv* env) {
int res = jniRegisterNativeMethods(env, CLASS_PATH, sMethods, NELEM(sMethods));
LOG_FATAL_IF(res < 0, "Unable to register native methods.");
(void)res; // Don't scream about unused variable in the LOG_NDEBUG case
return 0;
}

1
services/core/jni/com_android_server_tv_TvInputHal.cpp
View File

@@ -634,6 +634,7 @@ int register_android_server_tv_TvInputHal(JNIEnv* env) {
int res = jniRegisterNativeMethods(env, "com/android/server/tv/TvInputHal",
gTvInputHalMethods, NELEM(gTvInputHalMethods));
LOG_FATAL_IF(res < 0, "Unable to register native methods.");
(void)res; // Don't complain about unused variable in the LOG_NDEBUG case
jclass clazz;
FIND_CLASS(clazz, "com/android/server/tv/TvInputHal");