summaryrefslogtreecommitdiffstats
path: root/native/android
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2015-07-29 09:35:46 +0000
committerNarayan Kamath <narayan@google.com>2015-07-29 09:35:46 +0000
commit8d1e344f400fa35f3ddfef78a1dd1d805f3718b0 (patch)
tree2bac448f7c0fd62f2491ff99d9bbaf35826d5924 /native/android
parent5967ddbf05f146bdb6744207e3daed1aa76fc637 (diff)
downloadframeworks_base-8d1e344f400fa35f3ddfef78a1dd1d805f3718b0.zip
frameworks_base-8d1e344f400fa35f3ddfef78a1dd1d805f3718b0.tar.gz
frameworks_base-8d1e344f400fa35f3ddfef78a1dd1d805f3718b0.tar.bz2
Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."
This reverts commit 5967ddbf05f146bdb6744207e3daed1aa76fc637. Change-Id: I6d58129585a30d7c2ef39c8cbe796fd696c93f56
Diffstat (limited to 'native/android')
-rw-r--r--native/android/sensor.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/native/android/sensor.cpp b/native/android/sensor.cpp
index ca49476..26b41e8 100644
--- a/native/android/sensor.cpp
+++ b/native/android/sensor.cpp
@@ -39,6 +39,9 @@ using android::String16;
/*****************************************************************************/
+android::Mutex android::SensorManager::sLock;
+std::map<String16, SensorManager*> android::SensorManager::sPackageInstances;
+
ASensorManager* ASensorManager_getInstance()
{
return ASensorManager_getInstanceForPackage(NULL);
@@ -203,4 +206,4 @@ int ASensor_getReportingMode(ASensor const* sensor)
bool ASensor_isWakeUpSensor(ASensor const* sensor)
{
return static_cast<Sensor const*>(sensor)->isWakeUpSensor();
-}
+} \ No newline at end of file