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

AI 143244: am: CL 142801 am: CL 142799 Ensure thread exit resets mThread to null (synchronized with sListeners)

Browse Source 
If sensors_data_poll failed the sensor thread would exit leaving
  mThread non-null, hence SensorManager would never again attempt
  to start the thread because it assumes that it's still running,
  compromising future sensor notifications.
  Original author: andih
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143244
This commit is contained in:
Andreas Huber
2009-03-27 15:36:43 -07:00
committed by The Android Open Source Project
parent c4a5f87c7a
commit 059c446fbf
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -304,6 +304,9 @@ public class SensorManager extends IRotationWatcher.Stub
if (mSensorDataFd == null) {
Log.e(TAG, "mSensorDataFd == NULL, exiting");
synchronized (sListeners) {
mThread = null;
}
return;
}
// this thread is guaranteed to be unique
@@ -321,17 +324,16 @@ public class SensorManager extends IRotationWatcher.Stub
// wait for an event
final int sensor = sensors_data_poll(values, status, timestamp);
if (sensor == -1) {
// we lost the connection to the event stream. this happens
// when the last listener is removed.
Log.d(TAG, "_sensors_data_poll() failed, we bail out.");
break;
}
int accuracy = status[0];
synchronized (sListeners) {
if (sListeners.isEmpty()) {
// we have no more listeners, terminate the thread
if (sensor == -1 || sListeners.isEmpty()) {
if (sensor == -1) {
// we lost the connection to the event stream. this happens
// when the last listener is removed.
Log.d(TAG, "_sensors_data_poll() failed, we bail out.");
}
// we have no more listeners or polling failed, terminate the thread
sensors_data_close();
mThread = null;
break;