From 8d1e344f400fa35f3ddfef78a1dd1d805f3718b0 Mon Sep 17 00:00:00 2001
From: Narayan Kamath <narayan@google.com>
Date: Wed, 29 Jul 2015 09:35:46 +0000
Subject: Revert "Call getInstanceForPackage instead of creating a new
 SensorManager instance."

This reverts commit 5967ddbf05f146bdb6744207e3daed1aa76fc637.

Change-Id: I6d58129585a30d7c2ef39c8cbe796fd696c93f56
---
 core/jni/android_hardware_SensorManager.cpp | 2 +-
 native/android/sensor.cpp                   | 5 ++++-
 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
-- 
cgit v1.2.3-59-g8ed1b