diff options
| author | Aravind Akella <aakella@google.com> | 2015-07-24 11:08:41 -0700 |
|---|---|---|
| committer | Aravind Akella <aakella@google.com> | 2015-07-26 11:48:06 -0700 |
| commit | 869eb2089ec8a6286b944bfcff57e4cbe0c7e207 (patch) | |
| tree | 0c25310b3f2825c98813e867a11ceae582e68409 /include/gui | |
| parent | 5f920c1a2cf12c0638c05fbddee8ff6c1193731c (diff) | |
| download | frameworks_native-869eb2089ec8a6286b944bfcff57e4cbe0c7e207.zip frameworks_native-869eb2089ec8a6286b944bfcff57e4cbe0c7e207.tar.gz frameworks_native-869eb2089ec8a6286b944bfcff57e4cbe0c7e207.tar.bz2 | |
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
Diffstat (limited to 'include/gui')
| -rw-r--r-- | include/gui/SensorManager.h | 4 |
1 files changed, 3 insertions, 1 deletions
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 |