Merge "Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."" into mnc-dev

Author: narayank

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

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();
-}
+}