Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ff01fcec: am 7157c2ca: Merge "Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."" into mnc-dev

Browse Source 
* commit 'ff01fcecf5843104ba5ce835d70aae2ae8483616':
  Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."
This commit is contained in:
Narayan Kamath
2015-07-29 10:31:43 +00:00
committed by Android Git Automerger
parent ef3614ebb9 ff01fcecf5
commit 8fcb5697ed
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/android_hardware_SensorManager.cpp
View File

@@ -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

5
native/android/sensor.cpp
View File

@@ -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();
}
}