Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ben Fennema
2015-12-02 01:06:12 +00:00
committed by Android (Google) Code Review
parent ec7180f733 e9970bc981
commit 4d70e6a3c0
3 changed files with 0 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/java/android/hardware/SensorManager.java
View File

@@ -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);
}

8
core/java/android/hardware/SystemSensorManager.java
View File

@@ -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

15
core/jni/android_hardware_SensorManager.cpp
View File

@@ -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[] = {