ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 8f35ca97: SensorManager fixes. 

* commit '8f35ca973063e1449c5ec40b618393187a47ec58':
  SensorManager fixes.
This commit is contained in:
Aravind Akella 2015-08-25 19:06:52 +00:00 committed by Android Git Automerger
parent df1bc67019 8f35ca9730
commit 4baa69ddd2
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libs/gui/SensorManager.cpp
View File

@ -110,10 +110,20 @@ void SensorManager::sensorManagerDied()
} }
status_t SensorManager::assertStateLocked() const { status_t SensorManager::assertStateLocked() const {
bool initSensorManager = false;
if (mSensorServer == NULL) { if (mSensorServer == NULL) {
// try for 10 seconds before giving up ... initSensorManager = true;
} else {
// Ping binder to check if sensorservice is alive.
status_t err = IInterface::asBinder(mSensorServer)->pingBinder();
if (err != NO_ERROR) {
initSensorManager = true;
}
}
if (initSensorManager) {
// try for 300 seconds (60*5(getService() tries for 5 seconds)) before giving up ...
const String16 name("sensorservice"); const String16 name("sensorservice");
for (int i = 0;i < 10; i++) { for (int i = 0; i < 60; i++) {
status_t err = getService(name, &mSensorServer); status_t err = getService(name, &mSensorServer);
if (err == NAME_NOT_FOUND) { if (err == NAME_NOT_FOUND) {
sleep(1); sleep(1);
@ -135,9 +145,7 @@ status_t SensorManager::assertStateLocked() const {
DeathObserver(SensorManager& mgr) : mSensorManger(mgr) { } DeathObserver(SensorManager& mgr) : mSensorManger(mgr) { }
}; };
if (mSensorServer == NULL) { LOG_ALWAYS_FATAL_IF(mSensorServer.get() == NULL, "getService(SensorService) NULL");
ALOGE("FATAL getsensorservice returned NULL");
}
mDeathObserver = new DeathObserver(*const_cast<SensorManager *>(this)); mDeathObserver = new DeathObserver(*const_cast<SensorManager *>(this));
IInterface::asBinder(mSensorServer)->linkToDeath(mDeathObserver); IInterface::asBinder(mSensorServer)->linkToDeath(mDeathObserver);
@ -146,6 +154,8 @@ status_t SensorManager::assertStateLocked() const {
size_t count = mSensors.size(); size_t count = mSensors.size();
mSensorList = mSensorList =
static_cast<Sensor const**>(malloc(count * sizeof(Sensor*))); static_cast<Sensor const**>(malloc(count * sizeof(Sensor*)));
LOG_ALWAYS_FATAL_IF(mSensorList == NULL, "mSensorList NULL");
for (size_t i=0 ; i<count ; i++) { for (size_t i=0 ; i<count ; i++) {
mSensorList[i] = mSensors.array() + i; mSensorList[i] = mSensors.array() + i;
} }