am 33aeb1fe: am 822456eb: am 15938235: Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dev

* commit '33aeb1fead92d19d9e9f01fd880df552a0c12fcf':
  Call getInstanceForPackage instead of creating a new SensorManager instance.

2 files changed, 2 insertions, 5 deletions

diff --git a/core/jni/android_hardware_SensorManager.cpp b/core/jni/android_hardware_SensorManager.cpp
index ec565079133b..7d0afdcdd109 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) new SensorManager(String16(opPackageNameUtf.c_str()));
+    return (jlong) &SensorManager::getInstanceForPackage(String16(opPackageNameUtf.c_str()));
 }
 
 static jboolean
diff --git a/native/android/sensor.cpp b/native/android/sensor.cpp
index 26b41e85fddd..ca494769ad44 100644
--- a/native/android/sensor.cpp
+++ b/native/android/sensor.cpp
@@ -39,9 +39,6 @@ using android::String16;
 
 /*****************************************************************************/
 
-android::Mutex android::SensorManager::sLock;
-std::map<String16, SensorManager*> android::SensorManager::sPackageInstances;
-
 ASensorManager* ASensorManager_getInstance()
 {
     return ASensorManager_getInstanceForPackage(NULL);
@@ -206,4 +203,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
+}