Skip to content

Commit 8d1e344

Browse files
committed
Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."
This reverts commit 5967ddb. Change-Id: I6d58129585a30d7c2ef39c8cbe796fd696c93f56
1 parent 5967ddb commit 8d1e344

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

core/jni/android_hardware_SensorManager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ nativeCreate
138138
(JNIEnv *env, jclass clazz, jstring opPackageName)
139139
{
140140
ScopedUtfChars opPackageNameUtf(env, opPackageName);
141-
return (jlong) &SensorManager::getInstanceForPackage(String16(opPackageNameUtf.c_str()));
141+
return (jlong) new SensorManager(String16(opPackageNameUtf.c_str()));
142142
}
143143

144144
static jboolean

native/android/sensor.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ using android::String16;
3939

4040
/*****************************************************************************/
4141

42+
android::Mutex android::SensorManager::sLock;
43+
std::map<String16, SensorManager*> android::SensorManager::sPackageInstances;
44+
4245
ASensorManager* ASensorManager_getInstance()
4346
{
4447
return ASensorManager_getInstanceForPackage(NULL);
@@ -203,4 +206,4 @@ int ASensor_getReportingMode(ASensor const* sensor)
203206
bool ASensor_isWakeUpSensor(ASensor const* sensor)
204207
{
205208
return static_cast<Sensor const*>(sensor)->isWakeUpSensor();
206-
}
209+
}

0 commit comments

Comments
 (0)