commit 4d2ce017c59db25e7ec21694a1555ad2c710d1f0
author Narayan Kamath <narayan@google.com> Wed Jul 29 09:35:46 2015 +0000
committer The Android Automerger <android-build@google.com> Wed Jul 29 15:19:02 2015 -0700
tree ca85217b240c1812433d083a5e1230fabd74c0b0
parent 720b2cdd22e48b5deab1fe88c9758ac808fe16f1

Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."

This reverts commit 5967ddbf05f146bdb6744207e3daed1aa76fc637.

Change-Id: I6d58129585a30d7c2ef39c8cbe796fd696c93f56

core/jni/android_hardware_SensorManager.cpp

diff --git a/core/jni/android_hardware_SensorManager.cpp b/core/jni/android_hardware_SensorManager.cpp
index 7d0afdc..ec56507 100644
--- a/core/jni/android_hardware_SensorManager.cpp
+++ b/core/jni/android_hardware_SensorManager.cpp
@@ -138,7 +138,7 @@
 (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

diff --git a/native/android/sensor.cpp b/native/android/sensor.cpp
index ca49476..26b41e8 100644
--- a/native/android/sensor.cpp
+++ b/native/android/sensor.cpp
@@ -39,6 +39,9 @@
 
 /*****************************************************************************/
 
+android::Mutex android::SensorManager::sLock;
+std::map<String16, SensorManager*> android::SensorManager::sPackageInstances;
+
 ASensorManager* ASensorManager_getInstance()
 {
     return ASensorManager_getInstanceForPackage(NULL);
@@ -203,4 +206,4 @@
 bool ASensor_isWakeUpSensor(ASensor const* sensor)
 {
     return static_cast<Sensor const*>(sensor)->isWakeUpSensor();
-}
+}
\ No newline at end of file