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

am 02087754: Merge "Fix race condition and disable call." into jb-mr2-dev

Browse Source 
* commit '02087754fb49de7421b982267a283482b70bc297':
  Fix race condition and disable call.
This commit is contained in:
Jaikumar Ganesh
2013-04-12 17:25:41 -07:00
committed by Android Git Automerger
parent dd03b6dcb7 02087754fb
commit d347d51976
2 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1387,14 +1387,14 @@ public abstract class SensorManager {
* @throws IllegalArgumentException when sensor is a trigger sensor.
*/
public boolean cancelTriggerSensor(TriggerEventListener listener, Sensor sensor) {
return cancelTriggerSensorImpl(listener, sensor);
return cancelTriggerSensorImpl(listener, sensor, true);
}
/**
* @hide
*/
protected abstract boolean cancelTriggerSensorImpl(TriggerEventListener listener,
Sensor sensor);
Sensor sensor, boolean disable);
private LegacySensorManager getLegacySensorManager() {

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

@@ -20,6 +20,7 @@ import android.content.Context;
import android.os.Handler;
import android.os.Looper;
import android.os.MessageQueue;
import android.util.Log;
import android.util.SparseArray;
import android.util.SparseBooleanArray;
import android.util.SparseIntArray;
@@ -135,7 +136,7 @@ public class SystemSensorManager extends SensorManager {
if (sensor == null) {
result = queue.removeAllSensors();
} else {
result = queue.removeSensor(sensor);
result = queue.removeSensor(sensor, true);
}
if (result && !queue.hasSensors()) {
mSensorListeners.remove(listener);
@@ -170,7 +171,8 @@ public class SystemSensorManager extends SensorManager {
/** @hide */
@Override
protected boolean cancelTriggerSensorImpl(TriggerEventListener listener, Sensor sensor) {
protected boolean cancelTriggerSensorImpl(TriggerEventListener listener, Sensor sensor,
boolean disable) {
if (sensor != null && Sensor.getReportingMode(sensor) != Sensor.REPORTING_MODE_ONE_SHOT) {
return false;
}
@@ -181,7 +183,7 @@ public class SystemSensorManager extends SensorManager {
if (sensor == null) {
result = queue.removeAllSensors();
} else {
result = queue.removeSensor(sensor);
result = queue.removeSensor(sensor, disable);
}
if (result && !queue.hasSensors()) {
mTriggerListeners.remove(listener);
@@ -225,14 +227,17 @@ public class SystemSensorManager extends SensorManager {
public boolean addSensor(Sensor sensor, int delay) {
// Check if already present.
if (mActiveSensors.get(sensor.getHandle())) return false;
int handle = sensor.getHandle();
if (mActiveSensors.get(handle)) return false;
if (enableSensor(sensor, delay) == 0) {
mActiveSensors.put(sensor.getHandle(), true);
addSensorEvent(sensor);
return true;
// Get ready to receive events before calling enable.
mActiveSensors.put(handle, true);
addSensorEvent(sensor);
if (enableSensor(sensor, delay) != 0) {
removeSensor(sensor, false);
return false;
}
return false;
return true;
}
public boolean removeAllSensors() {
@@ -252,10 +257,10 @@ public class SystemSensorManager extends SensorManager {
return true;
}
public boolean removeSensor(Sensor sensor) {
public boolean removeSensor(Sensor sensor, boolean disable) {
final int handle = sensor.getHandle();
if (mActiveSensors.get(handle)) {
disableSensor(sensor);
if (disable) disableSensor(sensor);
mActiveSensors.put(sensor.getHandle(), false);
removeSensorEvent(sensor);
return true;
@@ -334,6 +339,10 @@ public class SystemSensorManager extends SensorManager {
long timestamp) {
final Sensor sensor = sHandleToSensor.get(handle);
SensorEvent t = mSensorsEvents.get(handle);
if (t == null) {
Log.e(TAG, "Error: Sensor Event is null for Sensor: " + sensor);
return;
}
// Copy from the values array.
System.arraycopy(values, 0, t.values, 0, t.values.length);
t.timestamp = timestamp;
@@ -390,14 +399,19 @@ public class SystemSensorManager extends SensorManager {
long timestamp) {
final Sensor sensor = sHandleToSensor.get(handle);
TriggerEvent t = mTriggerEvents.get(handle);
if (t == null) {
Log.e(TAG, "Error: Trigger Event is null for Sensor: " + sensor);
return;
}
// Copy from the values array.
System.arraycopy(values, 0, t.values, 0, t.values.length);
t.timestamp = timestamp;
t.sensor = sensor;
// A trigger sensor should be auto disabled.
mManager.cancelTriggerSensorImpl(mListener, sensor);
// A trigger sensor is auto disabled. So just clean up and don't call native
// disable.
mManager.cancelTriggerSensorImpl(mListener, sensor, false);
mListener.onTrigger(t);
}