am 7cd90763: am 4aac30fa: am 8fcb5697: am ff01fcec: am 7157c2ca: Merge "Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."" into mnc-dev

* commit '7cd90763d136dd6d72107f5ec8ca3baa04980dba':
  Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."

2 files changed, 5 insertions, 2 deletions

diff --git a/core/jni/android_hardware_SensorManager.cpp b/core/jni/android_hardware_SensorManager.cpp
index 7d0afdcdd109..ec565079133b 100644
--- a/core/jni/android_hardware_SensorManager.cpp
+++ b/core/jni/android_hardware_SensorManager.cpp
@@ -138,7 +138,7 @@ nativeCreate
 (JNIEnv *env, jclass clazz, jstring opPackageName)
 {
     ScopedUtfChars opPackageNameUtf(env, opPackageName);
-    return (jlong) &SensorManager::getInstanceForPackage(String16(opPackageNameUtf.c_str()));
+    return (jlong) new SensorManager(String16(opPackageNameUtf.c_str()));
 }
 
 static jboolean
diff --git a/native/android/sensor.cpp b/native/android/sensor.cpp
index ca494769ad44..26b41e85fddd 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