diff options
| author | Narayan Kamath <narayan@google.com> | 2015-07-29 10:07:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 10:07:56 +0000 |
| commit | 65f1d44cd8d96a4555ce6929bb5e2022307738e8 (patch) | |
| tree | 8c4c808fed5556bb7e583bbed64f35b2634fe305 /include | |
| parent | 3a77d009273731eeeb6782f0eee6458c46f30208 (diff) | |
| parent | a29db50c448f8d00a544b925544f3dee725f7750 (diff) | |
| download | frameworks_native-65f1d44cd8d96a4555ce6929bb5e2022307738e8.zip frameworks_native-65f1d44cd8d96a4555ce6929bb5e2022307738e8.tar.gz frameworks_native-65f1d44cd8d96a4555ce6929bb5e2022307738e8.tar.bz2 | |
am a29db50c: Merge "Revert "Bug fix in SensorManager."" into mnc-dev
* commit 'a29db50c448f8d00a544b925544f3dee725f7750':
Revert "Bug fix in SensorManager."
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 |