diff options
| author | Aravind Akella <aakella@google.com> | 2015-07-29 00:21:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-29 00:21:09 +0000 |
| commit | 2376bd6869f4cd835a351322d48d35567eceec4f (patch) | |
| tree | 0df723c57b19b4dcce5976cffd5a82d50f87d03d /include | |
| parent | bf7cd01ab0fce5c76364f78e3b9fdba078c197c0 (diff) | |
| parent | 869eb2089ec8a6286b944bfcff57e4cbe0c7e207 (diff) | |
| download | frameworks_native-2376bd6869f4cd835a351322d48d35567eceec4f.zip frameworks_native-2376bd6869f4cd835a351322d48d35567eceec4f.tar.gz frameworks_native-2376bd6869f4cd835a351322d48d35567eceec4f.tar.bz2 | |
Merge "Bug fix in SensorManager." into mnc-dev
Diffstat (limited to 'include')
| -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 |