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

Merge "Intialize Java Sensor object uuid in JNI" into nyc-dev

Browse Source
This commit is contained in:
Peng Xu
2016-04-27 19:37:57 +00:00
committed by Android (Google) Code Review
parent b639ae697a b85b1fed45
commit 7b0a3be001
2 changed files with 44 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/java/android/hardware/Sensor.java
View File

@@ -912,9 +912,9 @@ public final class Sensor {
* its type and name.
*/
public int getId() {
if (mUuid == ALL_0_UUID) {
if (mUuid.equals(ALL_0_UUID)) {
return 0;
} else if (mUuid == ALL_F_UUID) {
} else if (mUuid.equals(ALL_F_UUID)) {
return -1;
} else {
int id = Math.abs(mUuid.hashCode()) + 1;
@@ -1139,4 +1139,26 @@ public final class Sensor {
return false;
}
}
/**
* Sets the UUID associated with the sensor.
*
* NOTE: to be used only by native bindings in SensorManager.
*
* @see #getUuid
* @see UUID
*/
private void setUuid(long msb, long lsb) {
// reuse static object if possible
if (msb == lsb) {
if (msb == 0L) {
mUuid = ALL_0_UUID;
return;
} else if (msb == ~0L) {
mUuid = ALL_F_UUID;
return;
}
}
mUuid = new UUID(msb, lsb);
}
}

46
core/jni/android_hardware_SensorManager.cpp
View File

@@ -50,6 +50,7 @@ struct {
struct SensorOffsets
{
jclass clazz;
//fields
jfieldID name;
jfieldID vendor;
jfieldID version;
@@ -64,7 +65,9 @@ struct SensorOffsets
jfieldID requiredPermission;
jfieldID maxDelay;
jfieldID flags;
//methods
jmethodID setType;
jmethodID setUuid;
jmethodID init;
} gSensorOffsets;
@@ -102,6 +105,7 @@ nativeClassInit (JNIEnv *_env, jclass _this)
sensorOffsets.flags = _env->GetFieldID(sensorClass, "mFlags", "I");
sensorOffsets.setType = _env->GetMethodID(sensorClass, "setType", "(I)Z");
sensorOffsets.setUuid = _env->GetMethodID(sensorClass, "setUuid", "(JJ)V");
sensorOffsets.init = _env->GetMethodID(sensorClass, "<init>", "()V");
// java.util.List;
@@ -192,11 +196,26 @@ translateNativeSensorToJavaSensor(JNIEnv *env, jobject sensor, const Sensor& nat
requiredPermission);
env->SetIntField(sensor, sensorOffsets.maxDelay, nativeSensor.getMaxDelay());
env->SetIntField(sensor, sensorOffsets.flags, nativeSensor.getFlags());
if (env->CallBooleanMethod(sensor, sensorOffsets.setType, nativeSensor.getType())
== JNI_FALSE) {
jstring stringType = getInternedString(env, &nativeSensor.getStringType());
env->SetObjectField(sensor, sensorOffsets.stringType, stringType);
}
// java.util.UUID constructor UUID(long a, long b) assumes the two long inputs a and b
// correspond to first half and second half of the 16-byte stream in big-endian,
// respectively, if the byte stream is serialized according to RFC 4122 (Sec. 4.1.2).
//
// For Java UUID 12345678-90AB-CDEF-1122-334455667788, the byte stream will be
// (uint8_t) {0x12, 0x34, 0x56, 0x78, 0x90, 0xAB, 0xCD, 0xEF, ....} according RFC 4122.
//
// According to Java UUID constructor document, the long parameter a should be always
// 0x12345678980ABCDEF regardless of host machine endianess. Thus, htobe64 is used to
// convert int64_t read directly, which will be in host-endian, to the big-endian required
// by Java constructor.
const int64_t (&uuid)[2] = nativeSensor.getUuid().i64;
env->CallVoidMethod(sensor, sensorOffsets.setUuid, htobe64(uuid[0]), htobe64(uuid[1]));
}
return sensor;
}
@@ -212,32 +231,7 @@ nativeGetSensorAtIndex(JNIEnv *env, jclass clazz, jlong sensorManager, jobject s
return false;
}
Sensor const* const list = sensorList[index];
const SensorOffsets& sensorOffsets(gSensorOffsets);
jstring name = getInternedString(env, &list->getName());
jstring vendor = getInternedString(env, &list->getVendor());
jstring requiredPermission = getInternedString(env, &list->getRequiredPermission());
env->SetObjectField(sensor, sensorOffsets.name, name);
env->SetObjectField(sensor, sensorOffsets.vendor, vendor);
env->SetIntField(sensor, sensorOffsets.version, list->getVersion());
env->SetIntField(sensor, sensorOffsets.handle, list->getHandle());
env->SetFloatField(sensor, sensorOffsets.range, list->getMaxValue());
env->SetFloatField(sensor, sensorOffsets.resolution, list->getResolution());
env->SetFloatField(sensor, sensorOffsets.power, list->getPowerUsage());
env->SetIntField(sensor, sensorOffsets.minDelay, list->getMinDelay());
env->SetIntField(sensor, sensorOffsets.fifoReservedEventCount,
list->getFifoReservedEventCount());
env->SetIntField(sensor, sensorOffsets.fifoMaxEventCount,
list->getFifoMaxEventCount());
env->SetObjectField(sensor, sensorOffsets.requiredPermission,
requiredPermission);
env->SetIntField(sensor, sensorOffsets.maxDelay, list->getMaxDelay());
env->SetIntField(sensor, sensorOffsets.flags, list->getFlags());
if (env->CallBooleanMethod(sensor, sensorOffsets.setType, list->getType()) == JNI_FALSE) {
jstring stringType = getInternedString(env, &list->getStringType());
env->SetObjectField(sensor, sensorOffsets.stringType, stringType);
}
return true;
return translateNativeSensorToJavaSensor(env, sensor, *sensorList[index]) != NULL;
}
static void