From 869eb2089ec8a6286b944bfcff57e4cbe0c7e207 Mon Sep 17 00:00:00 2001
From: Aravind Akella <aakella@google.com>
Date: Fri, 24 Jul 2015 11:08:41 -0700
Subject: Bug fix in SensorManager.

If SensorService hasn't started when SensorManager instance is requested, keep retrying for a
longer duration.

Bug: 22529981
Change-Id: I4ba6b760608e34d79273aeb39568f0fa72fbaf9d
---
 include/gui/SensorManager.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/gui/SensorManager.h b/include/gui/SensorManager.h
index 3796067..9794d4e 100644
--- a/include/gui/SensorManager.h
+++ b/include/gui/SensorManager.h
@@ -101,7 +101,6 @@ public:
         return *sensorManager;
     }
 
-    SensorManager(const String16& opPackageName);
     ~SensorManager();
 
     ssize_t getSensorList(Sensor const* const** list) const;
@@ -113,6 +112,7 @@ private:
     // DeathRecipient interface
     void sensorManagerDied();
 
+    SensorManager(const String16& opPackageName);
     status_t assertStateLocked() const;
 
 private:
@@ -127,6 +127,8 @@ private:
     const String16 mOpPackageName;
 };
 
+android::Mutex android::SensorManager::sLock;
+std::map<String16, SensorManager*> android::SensorManager::sPackageInstances;
 // ----------------------------------------------------------------------------
 }; // namespace android
 
-- 
cgit v1.1