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

Commit 8aefad60 authored by Mao Jinlong's avatar Mao Jinlong Committed by Ricardo Cerqueira
Browse files

alarm: add JNI interface for clearing alarm 

Add the JNI for clearing cancelled alarm, otherwise kernel driver
would know nothing about the alarm status. E.g. power-off alarm
would not be really cleared in alarm driver even it is cancelled
in the apps/framework.

Change-Id: I65579336240e992a7e6c7ec33325ce4627fd9bec
parent a7404e86

services/core/java/com/android/server/AlarmManagerService.java

+15 −0
Original line number Diff line number Diff line
@@ -1284,6 +1284,20 @@ class AlarmManagerService extends SystemService { 
        boolean didRemove = false;

        for (int i = mAlarmBatches.size() - 1; i >= 0; i--) {

            Batch b = mAlarmBatches.get(i);

            ArrayList<Alarm> alarmList = b.alarms;

            Alarm alarm = null;

            for (int j = alarmList.size() - 1; j >= 0; j--) {

                alarm = alarmList.get(j);

                if (alarm.type == RTC_POWEROFF_WAKEUP && alarm.operation.equals(operation)) {

                    long alarmSeconds, alarmNanoseconds;

                    alarmSeconds = alarm.when / 1000;

                    alarmNanoseconds = (alarm.when % 1000) * 1000 * 1000;

                    Slog.w(TAG,"Clear alarm type=" + alarm.type + ",alarmSeconds=" +

                       alarmSeconds);

                    clear(mNativeData, alarm.type, alarmSeconds, alarmNanoseconds);

                    mNextRtcWakeup = 0;

                }

            }

            didRemove |= b.remove(operation);

            if (b.size() == 0) {

                mAlarmBatches.remove(i);
@@ -1436,6 +1450,7 @@ class AlarmManagerService extends SystemService { 
    private native long init();

    private native void close(long nativeData);

    private native void set(long nativeData, int type, long seconds, long nanoseconds);

    private native void clear(long nativeData, int type, long seconds, long nanoseconds);

    private native int waitForAlarm(long nativeData);

    private native int setKernelTime(long nativeData, long millis);

    private native int setKernelTimezone(long nativeData, int minuteswest);

services/core/jni/com_android_server_AlarmManagerService.cpp

+23 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ public: 
    AlarmImplAlarmDriver(int fd) : AlarmImpl(&fd, 1) { }



    int set(int type, struct timespec *ts);

    int clear(int type, struct timespec *ts);

    int setTime(struct timeval *tv);

    int waitForAlarm();

};
@@ -111,6 +112,11 @@ int AlarmImplAlarmDriver::set(int type, struct timespec *ts) 
    return ioctl(fds[0], ANDROID_ALARM_SET(type), ts);

}



int AlarmImplAlarmDriver::clear(int type, struct timespec *ts)

{

    return ioctl(fds[0], ANDROID_ALARM_CLEAR(type), ts);

}



int AlarmImplAlarmDriver::setTime(struct timeval *tv)

{

    struct timespec ts;
@@ -371,6 +377,22 @@ static void android_server_AlarmManagerService_set(JNIEnv*, jobject, jlong nativ 
    }

}



static void android_server_AlarmManagerService_clear(JNIEnv*, jobject, jlong nativeData, jint type, jlong seconds, jlong nanoseconds)

{

    AlarmImplAlarmDriver *impl = reinterpret_cast<AlarmImplAlarmDriver *>(nativeData);

    struct timespec ts;

    ts.tv_sec = seconds;

    ts.tv_nsec = nanoseconds;



    int result = impl->clear(type, &ts);

    if (result < 0)

    {

        ALOGE("Unable to clear alarm  %lld.%09lld: %s\n",

              static_cast<long long>(seconds),

              static_cast<long long>(nanoseconds), strerror(errno));

    }

}



static jint android_server_AlarmManagerService_waitForAlarm(JNIEnv*, jobject, jlong nativeData)

{

    AlarmImpl *impl = reinterpret_cast<AlarmImpl *>(nativeData);
@@ -395,6 +417,7 @@ static JNINativeMethod sMethods[] = { 
    {"init", "()J", (void*)android_server_AlarmManagerService_init},

    {"close", "(J)V", (void*)android_server_AlarmManagerService_close},

    {"set", "(JIJJ)V", (void*)android_server_AlarmManagerService_set},

    {"clear", "(JIJJ)V", (void*)android_server_AlarmManagerService_clear},

    {"waitForAlarm", "(J)I", (void*)android_server_AlarmManagerService_waitForAlarm},

    {"setKernelTime", "(JJ)I", (void*)android_server_AlarmManagerService_setKernelTime},

    {"setKernelTimezone", "(JI)I", (void*)android_server_AlarmManagerService_setKernelTimezone},