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

Commit 4d70e6a3 authored by Ben Fennema's avatar Ben Fennema Committed by Android (Google) Code Review
Browse files

Merge "Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"" into cw-e-dev

parents ec7180f7 e9970bc9

core/java/android/hardware/SensorManager.java

+0 −23
Original line number Diff line number Diff line
@@ -1684,27 +1684,4 @@ public abstract class SensorManager { 
        }

        return delay;

    }



    /**

     * Send configuration string to Sensor HAL.

     *

     * @param data String which includes sensor physical data.

     *        Sensor HAL is taking care of parsing data from string and

     *        setting values to Sensor HW.

     *

     * @return true if successfully send to HAL.

     */

     /**

     * @hide

     */

    public boolean SetPhysicalData(String data)

    {

        //Log.d(TAG, "SensorManager.SetPhysicalData(" + data + ")");

        return SetPhysicalDataImpl(data);

    }



     /**

     * @hide

     */

     protected abstract boolean SetPhysicalDataImpl(String data);

}

core/java/android/hardware/SystemSensorManager.java

+0 −8
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ public class SystemSensorManager extends SensorManager { 
    private static native boolean nativeGetSensorAtIndex(long nativeInstance,

            Sensor sensor, int index);

    private static native boolean nativeIsDataInjectionEnabled(long nativeInstance);

    private static native boolean nativeSetPhysicalData(long nativeInstance, String data);



    private static boolean sSensorModuleInitialized = false;

    private static InjectEventQueue mInjectEventQueue = null;
@@ -275,13 +274,6 @@ public class SystemSensorManager extends SensorManager { 
        }

    }



    @Override

    protected boolean SetPhysicalDataImpl(String data)

    {

        //Log.d(TAG, "SystemSensorManager.SetPhysicalDataImpl(" + data + ")");

        return nativeSetPhysicalData(mNativeInstance,data);

    }



    /*

     * BaseEventQueue is the communication channel with the sensor service,

     * SensorEventQueue, TriggerEventQueue are subclases and there is one-to-one mapping between

core/jni/android_hardware_SensorManager.cpp

+0 −15
Original line number Diff line number Diff line
@@ -185,18 +185,6 @@ static jboolean nativeIsDataInjectionEnabled(JNIEnv *_env, jclass _this, jlong s 
    return mgr->isDataInjectionEnabled();

}



static jboolean nativeSetPhysicalData(JNIEnv *env, jclass clazz,jlong sensorManager, jstring javaString)

{

    SensorManager* mgr = reinterpret_cast<SensorManager*>(sensorManager);

    const char *nativeString = env->GetStringUTFChars(javaString, JNI_FALSE);

    bool return_value;



    //ALOGD("android_hardware_SensorManager, call JNI function nativeSetPhysicalData(%s)",nativeString);

    return_value = mgr->SetPhysicalData(nativeString);



    env->ReleaseStringUTFChars(javaString, nativeString);

    return return_value;

}

//----------------------------------------------------------------------------



class Receiver : public LooperCallback {
@@ -370,9 +358,6 @@ static JNINativeMethod gSystemSensorManagerMethods[] = { 
    {"nativeIsDataInjectionEnabled",

            "(J)Z",

            (void*)nativeIsDataInjectionEnabled},

    {"nativeSetPhysicalData",

            "(JLjava/lang/String;)Z",

            (void*)nativeSetPhysicalData },

};



static JNINativeMethod gBaseEventQueueMethods[] = {