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

Commit e6904fbd authored by Vincent Becker's avatar Vincent Becker Committed by David Wagner
Browse files

Vibra: Add loading of the vibrator hardware module. 



Vibrator HAL is now formed of two hardware modules: one is the default
AOSP and the other is the vendor implementation.

The vendor implementation will be loaded prior to the default one.
For that, the vibrator service has to load the module before
registering itself to the JNI.

This change is related to other changes in:
 - hardware/libhardware
 - hardware/libhardware_legacy

Change-Id: I844279f5535289f079d412fdc44c5cb3c9c1130c
Author: Vincent Becker <vincentx.becker@intel.com>
Signed-off-by: default avatarVincent Becker <vincentx.becker@intel.com>
Signed-off-by: default avatarShuo Gao <shuo.gao@intel.com>
Signed-off-by: default avatarBruce Beare <bruce.j.beare@intel.com>
Signed-off-by: default avatarJack Ren <jack.ren@intel.com>
Signed-off-by: default avatarDavid Wagner <david.wagner@intel.com>
Author-tracking-BZ: 49760 94611
parent 34c495d2

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

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ public class VibratorService extends IVibratorService.Stub 
    private SettingsObserver mSettingObserver;



    native static boolean vibratorExists();

    native static void vibratorInit();

    native static void vibratorOn(long milliseconds);

    native static void vibratorOff();
@@ -147,6 +148,7 @@ public class VibratorService extends IVibratorService.Stub 
    }



    VibratorService(Context context) {

        vibratorInit();

        // Reset the hardware to a default state, in case this is a runtime

        // restart instead of a fresh boot.

        vibratorOff();

services/core/jni/com_android_server_VibratorService.cpp

+43 −6
Original line number Diff line number Diff line
@@ -22,32 +22,69 @@ 


#include <utils/misc.h>

#include <utils/Log.h>

#include <hardware_legacy/vibrator.h>

#include <hardware/vibrator.h>



#include <stdio.h>



namespace android

{



static hw_module_t *gVibraModule = NULL;

static vibrator_device_t *gVibraDevice = NULL;



static void vibratorInit(JNIEnv /* env */, jobject /* clazz */)

{

    if (gVibraModule != NULL) {

        return;

    }



    int err = hw_get_module(VIBRATOR_HARDWARE_MODULE_ID, (hw_module_t const**)&gVibraModule);



    if (err) {

        ALOGE("Couldn't load %s module (%s)", VIBRATOR_HARDWARE_MODULE_ID, strerror(-err));

    } else {

        if (gVibraModule) {

            vibrator_open(gVibraModule, &gVibraDevice);

        }

    }

}



static jboolean vibratorExists(JNIEnv* /* env */, jobject /* clazz */)

{

    return vibrator_exists() > 0 ? JNI_TRUE : JNI_FALSE;

    if (gVibraModule && gVibraDevice) {

        return JNI_TRUE;

    } else {

        return JNI_FALSE;

    }

}



static void vibratorOn(JNIEnv* /* env */, jobject /* clazz */, jlong timeout_ms)

{

    // ALOGI("vibratorOn\n");

    vibrator_on(timeout_ms);

    if (gVibraDevice) {

        int err = gVibraDevice->vibrator_on(gVibraDevice, timeout_ms);

        if (err != 0) {

            ALOGE("The hw module failed in vibrator_on: %s", strerror(-err));

        }

    } else {

        ALOGW("Tried to vibrate but there is no vibrator device.");

    }

}



static void vibratorOff(JNIEnv* /* env */, jobject /* clazz */)

{

    // ALOGI("vibratorOff\n");

    vibrator_off();

    if (gVibraDevice) {

        int err = gVibraDevice->vibrator_off(gVibraDevice);

        if (err != 0) {

            ALOGE("The hw module failed in vibrator_off(): %s", strerror(-err));

        }

    } else {

        ALOGW("Tried to stop vibrating but there is no vibrator device.");

    }

}



static JNINativeMethod method_table[] = {

    { "vibratorExists", "()Z", (void*)vibratorExists },

    { "vibratorInit", "()V", (void*)vibratorInit },

    { "vibratorOn", "(J)V", (void*)vibratorOn },

    { "vibratorOff", "()V", (void*)vibratorOff }

};