diff options
| author | Mathias Agopian <mathias@google.com> | 2012-05-04 16:30:32 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-04 16:30:32 -0700 |
| commit | b05b158b84b620e46d736dcaf038fa6268cbcb00 (patch) | |
| tree | 9ffc8e5b20fe3ca2dc8493a0487b94fdc48c81ed /core/jni | |
| parent | 6ad5b4f637e64cb07a17079424cff66c867c7f27 (diff) | |
| parent | 277d1b2f49897e90a8ec9bd0f05ea4ed62d2ff28 (diff) | |
| download | frameworks_base-b05b158b84b620e46d736dcaf038fa6268cbcb00.zip frameworks_base-b05b158b84b620e46d736dcaf038fa6268cbcb00.tar.gz frameworks_base-b05b158b84b620e46d736dcaf038fa6268cbcb00.tar.bz2 | |
Merge "report a Sensor's version from the HAL" into jb-dev
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android_hardware_SensorManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_hardware_SensorManager.cpp b/core/jni/android_hardware_SensorManager.cpp index 9abfb3a..eddd838 100644 --- a/core/jni/android_hardware_SensorManager.cpp +++ b/core/jni/android_hardware_SensorManager.cpp @@ -69,7 +69,7 @@ sensors_module_get_next_sensor(JNIEnv *env, jobject clazz, jobject sensor, jint jstring vendor = env->NewStringUTF(list->getVendor().string()); env->SetObjectField(sensor, sensorOffsets.name, name); env->SetObjectField(sensor, sensorOffsets.vendor, vendor); - env->SetIntField(sensor, sensorOffsets.version, 1); + env->SetIntField(sensor, sensorOffsets.version, list->getVersion()); env->SetIntField(sensor, sensorOffsets.handle, list->getHandle()); env->SetIntField(sensor, sensorOffsets.type, list->getType()); env->SetFloatField(sensor, sensorOffsets.range, list->getMaxValue()); |