Call getInstanceForPackage instead of creating a new SensorManager instance.

Aravind Akella · Aravind Akella · commit 5967ddbf05f1 · 2015-07-27T14:19:31.000-07:00
Bug: 22529981
Change-Id: Id3adfbcf55d1268db1a555c72a06456a5219c086
diff --git 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
@@ -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();
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ nativeCreate`
`138`	`138`	`(JNIEnv *env, jclass clazz, jstring opPackageName)`
`139`	`139`	`{`
`140`	`140`	`ScopedUtfChars opPackageNameUtf(env, opPackageName);`
`141`		`- return (jlong) new SensorManager(String16(opPackageNameUtf.c_str()));`
	`141`	`+ return (jlong) &SensorManager::getInstanceForPackage(String16(opPackageNameUtf.c_str()));`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`static jboolean`
Original file line number	Diff line number	Diff line change
`@@ -39,9 +39,6 @@ using android::String16;`
`39`	`39`
`40`	`40`	`/*****************************************************************************/`
`41`	`41`
`42`		`-android::Mutex android::SensorManager::sLock;`
`43`		`-std::map<String16, SensorManager*> android::SensorManager::sPackageInstances;`
`44`		`-`
`45`	`42`	`ASensorManager* ASensorManager_getInstance()`
`46`	`43`	`{`
`47`	`44`	`return ASensorManager_getInstanceForPackage(NULL);`
`@@ -206,4 +203,4 @@ int ASensor_getReportingMode(ASensor const* sensor)`
`206`	`203`	`bool ASensor_isWakeUpSensor(ASensor const* sensor)`
`207`	`204`	`{`
`208`	`205`	`return static_cast<Sensor const*>(sensor)->isWakeUpSensor();`
`209`		`-}`
	`206`	`+}`