From 2af91d0e104b3a80f3e832e464e52893a55a715f Mon Sep 17 00:00:00 2001
From: Aravind Akella <aakella@google.com>
Date: Wed, 29 Jul 2015 18:39:52 -0700
Subject: [PATCH] Call getInstanceForPackage instead of creating a new
 SensorManager instance.

Bug: 22529981
Change-Id: If077e042a4af940dfb1fc9c4ac8b9d352dd32685
---
 core/jni/android_hardware_SensorManager.cpp | 2 +-
 native/android/sensor.cpp                   | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/core/jni/android_hardware_SensorManager.cpp b/core/jni/android_hardware_SensorManager.cpp
index ec565079133be..7d0afdcdd1099 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 26b41e85fddd2..76c701a5b8ce1 100644
--- a/native/android/sensor.cpp
+++ b/native/android/sensor.cpp
@@ -38,10 +38,6 @@ using android::String8;
 using android::String16;
 
 /*****************************************************************************/
-
-android::Mutex android::SensorManager::sLock;
-std::map<String16, SensorManager*> android::SensorManager::sPackageInstances;
-
 ASensorManager* ASensorManager_getInstance()
 {
     return ASensorManager_getInstanceForPackage(NULL);
@@ -206,4 +202,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
+}