am 65f1d44c: am a29db50c: Merge "Revert "Bug fix in SensorManager."" into mnc-dev

* commit '65f1d44cd8d96a4555ce6929bb5e2022307738e8':
  Revert "Bug fix in SensorManager."

1 files changed, 3 insertions, 8 deletions

diff --git a/libs/gui/SensorManager.cpp b/libs/gui/SensorManager.cpp
index ead535e637..dd3778137a 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) {