diff options
| author | Narayan Kamath <narayan@google.com> | 2015-07-29 09:41:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-29 09:41:23 +0000 |
| commit | a29db50c448f8d00a544b925544f3dee725f7750 (patch) | |
| tree | 94246fa9f58e15622c39d09da6612b2a009d242f /include | |
| parent | 2376bd6869f4cd835a351322d48d35567eceec4f (diff) | |
| parent | 8034fc63a06768678a7afe0bfcc7070a65eda1ab (diff) | |
| download | frameworks_native-a29db50c448f8d00a544b925544f3dee725f7750.zip frameworks_native-a29db50c448f8d00a544b925544f3dee725f7750.tar.gz frameworks_native-a29db50c448f8d00a544b925544f3dee725f7750.tar.bz2 | |
Merge "Revert "Bug fix in SensorManager."" into mnc-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/gui/SensorManager.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/gui/SensorManager.h b/include/gui/SensorManager.h index 9794d4e..3796067 100644 --- a/include/gui/SensorManager.h +++ b/include/gui/SensorManager.h @@ -101,6 +101,7 @@ public: return *sensorManager; } + SensorManager(const String16& opPackageName); ~SensorManager(); ssize_t getSensorList(Sensor const* const** list) const; @@ -112,7 +113,6 @@ private: // DeathRecipient interface void sensorManagerDied(); - SensorManager(const String16& opPackageName); status_t assertStateLocked() const; private: @@ -127,8 +127,6 @@ private: const String16 mOpPackageName; }; -android::Mutex android::SensorManager::sLock; -std::map<String16, SensorManager*> android::SensorManager::sPackageInstances; // ---------------------------------------------------------------------------- }; // namespace android |