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

am 15938235: Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dev

Browse Source 
* commit '15938235d25a879ebb000cb3671fd75cb092e981':
  Call getInstanceForPackage instead of creating a new SensorManager instance.
This commit is contained in:
Aravind Akella
2015-07-29 00:40:53 +00:00
committed by Android Git Automerger
parent 353fe1c665 15938235d2
commit 822456ebe3
2 changed files with 2 additions and 5 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) new SensorManager(String16(opPackageNameUtf.c_str()));
return (jlong) &SensorManager::getInstanceForPackage(String16(opPackageNameUtf.c_str()));
}
static jboolean

5
native/android/sensor.cpp
View File

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