diff options
| author | Narayan Kamath <narayan@google.com> | 2015-07-29 10:07:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 10:07:56 +0000 |
| commit | 65f1d44cd8d96a4555ce6929bb5e2022307738e8 (patch) | |
| tree | 8c4c808fed5556bb7e583bbed64f35b2634fe305 /libs/gui | |
| parent | 3a77d009273731eeeb6782f0eee6458c46f30208 (diff) | |
| parent | a29db50c448f8d00a544b925544f3dee725f7750 (diff) | |
| download | frameworks_native-65f1d44cd8d96a4555ce6929bb5e2022307738e8.zip frameworks_native-65f1d44cd8d96a4555ce6929bb5e2022307738e8.tar.gz frameworks_native-65f1d44cd8d96a4555ce6929bb5e2022307738e8.tar.bz2 | |
am a29db50c: Merge "Revert "Bug fix in SensorManager."" into mnc-dev
* commit 'a29db50c448f8d00a544b925544f3dee725f7750':
Revert "Bug fix in SensorManager."
Diffstat (limited to 'libs/gui')
| -rw-r--r-- | libs/gui/SensorManager.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/libs/gui/SensorManager.cpp b/libs/gui/SensorManager.cpp index ead535e..dd37781 100644 --- a/libs/gui/SensorManager.cpp +++ b/libs/gui/SensorManager.cpp @@ -59,13 +59,12 @@ void SensorManager::sensorManagerDied() status_t SensorManager::assertStateLocked() const { if (mSensorServer == NULL) { + // try for one second const String16 name("sensorservice"); - // try 10 times before giving up ... - for (int i = 0; i < 10; ++i) { + for (int i=0 ; i<4 ; i++) { status_t err = getService(name, &mSensorServer); if (err == NAME_NOT_FOUND) { - // Sleep for 1 second before retrying. - sleep(1); + usleep(250000); continue; } if (err != NO_ERROR) { @@ -74,10 +73,6 @@ status_t SensorManager::assertStateLocked() const { break; } - if (mSensorServer == NULL) { - ALOGE("FATAL getsensorservice returned` NULL"); - } - class DeathObserver : public IBinder::DeathRecipient { SensorManager& mSensorManger; virtual void binderDied(const wp<IBinder>& who) { |