am 3545433d: am 9f4e67c5: Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings"

* commit '3545433d052769417dcdd70bc59fbf31f9925ba4':
  Clean up native AlarmManagerService tabs/spaces and unused parameter warnings
This commit is contained in:
Greg Hackmann
2013-12-17 18:18:58 +00:00
committed by Android Git Automerger

View File

@@ -37,7 +37,7 @@
namespace android { namespace android {
static jint android_server_AlarmManagerService_setKernelTimezone(JNIEnv* env, jobject obj, jint fd, jint minswest) static jint android_server_AlarmManagerService_setKernelTimezone(JNIEnv*, jobject, jint, jint minswest)
{ {
struct timezone tz; struct timezone tz;
@@ -55,17 +55,17 @@ static jint android_server_AlarmManagerService_setKernelTimezone(JNIEnv* env, jo
return 0; return 0;
} }
static jint android_server_AlarmManagerService_init(JNIEnv* env, jobject obj) static jint android_server_AlarmManagerService_init(JNIEnv*, jobject)
{ {
return open("/dev/alarm", O_RDWR); return open("/dev/alarm", O_RDWR);
} }
static void android_server_AlarmManagerService_close(JNIEnv* env, jobject obj, jint fd) static void android_server_AlarmManagerService_close(JNIEnv*, jobject, jint fd)
{ {
close(fd); close(fd);
} }
static void android_server_AlarmManagerService_set(JNIEnv* env, jobject obj, jint fd, jint type, jlong seconds, jlong nanoseconds) static void android_server_AlarmManagerService_set(JNIEnv*, jobject, jint fd, jint type, jlong seconds, jlong nanoseconds)
{ {
struct timespec ts; struct timespec ts;
ts.tv_sec = seconds; ts.tv_sec = seconds;
@@ -78,7 +78,7 @@ static void android_server_AlarmManagerService_set(JNIEnv* env, jobject obj, jin
} }
} }
static jint android_server_AlarmManagerService_waitForAlarm(JNIEnv* env, jobject obj, jint fd) static jint android_server_AlarmManagerService_waitForAlarm(JNIEnv*, jobject, jint fd)
{ {
int result = 0; int result = 0;