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

Commit 2d6b67d3 authored by Mike Lockwood's avatar Mike Lockwood
Browse files

SensorService: call close_data_source when we have no more sensor clients. 



Change-Id: I94accda4571c3f2cf6f8a5b6801e37c30c027fe1
Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent 56f67d21

services/java/com/android/server/SensorService.java

+15 −6
Original line number Diff line number Diff line
@@ -84,12 +84,16 @@ class SensorService extends ISensorService.Stub { 
                    if (hasSensor(sensor)) {

                        removeSensor(sensor);

                        try {

                            deactivateIfUnused(sensor);

                            deactivateIfUnusedLocked(sensor);

                        } catch (RemoteException e) {

                            Log.w(TAG, "RemoteException in binderDied");

                        }

                    }

                }

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

                    _sensors_control_wake();

                    _sensors_control_close();

                }

                mListeners.notify();

            }

        }
@@ -102,8 +106,11 @@ class SensorService extends ISensorService.Stub { 
    }

    

    public Bundle getDataChannel() throws RemoteException {

        // synchronize so we do not require sensor HAL to be thread-safe.

        synchronized(mListeners) {

            return _sensors_control_open();

        }

    }



    public boolean enableSensor(IBinder binder, String name, int sensor, int enable)

             throws RemoteException {
@@ -163,7 +170,7 @@ class SensorService extends ISensorService.Stub { 
                l.addSensor(sensor, enable);

            } else {

                l.removeSensor(sensor);

                deactivateIfUnused(sensor);

                deactivateIfUnusedLocked(sensor);

                if (l.mSensors == 0) {

                    mListeners.remove(l);

                    binder.unlinkToDeath(l, 0);
@@ -173,12 +180,13 @@ class SensorService extends ISensorService.Stub { 
            

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

                _sensors_control_wake();

                _sensors_control_close();

            }

        }        

        return true;

    }



    void deactivateIfUnused(int sensor) throws RemoteException {

    private void deactivateIfUnusedLocked(int sensor) throws RemoteException {

        int size = mListeners.size();

        for (int i=0 ; i<size ; i++) {

            if (mListeners.get(i).hasSensor(sensor))
@@ -187,10 +195,11 @@ class SensorService extends ISensorService.Stub { 
        _sensors_control_activate(sensor, false);

    }



    ArrayList<Listener> mListeners = new ArrayList<Listener>();

    private ArrayList<Listener> mListeners = new ArrayList<Listener>();



    private static native int _sensors_control_init();

    private static native Bundle _sensors_control_open();

    private static native int _sensors_control_close();

    private static native boolean _sensors_control_activate(int sensor, boolean activate);

    private static native int _sensors_control_set_delay(int ms);

    private static native int _sensors_control_wake();

services/jni/com_android_server_SensorService.cpp

+10 −0
Original line number Diff line number Diff line
@@ -111,6 +111,15 @@ android_open(JNIEnv *env, jclass clazz) 
    return bundle;

}



static jint

android_close(JNIEnv *env, jclass clazz)

{

    if (sSensorDevice->close_data_source)

        return sSensorDevice->close_data_source(sSensorDevice);

    else

        return 0;

}



static jboolean

android_activate(JNIEnv *env, jclass clazz, jint sensor, jboolean activate)

{
@@ -135,6 +144,7 @@ android_data_wake(JNIEnv *env, jclass clazz) 
static JNINativeMethod gMethods[] = {

    {"_sensors_control_init",     "()I",   (void*) android_init },

    {"_sensors_control_open",     "()Landroid/os/Bundle;",  (void*) android_open },

    {"_sensors_control_close",     "()I",  (void*) android_close },

    {"_sensors_control_activate", "(IZ)Z", (void*) android_activate },

    {"_sensors_control_wake",     "()I", (void*) android_data_wake },

    {"_sensors_control_set_delay","(I)I", (void*) android_set_delay },