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

am e01a4afb: am e025f4d9: am ccaf066d: Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dr-dev

Browse Source 
* commit 'e01a4afb618159d68b5b5b00e29cbd8ced56f3dd':
  Call getInstanceForPackage instead of creating a new SensorManager instance.
This commit is contained in:
Aravind Akella
2015-07-30 22:02:43 +00:00
committed by Android Git Automerger
parent b8f1326b30 e01a4afb61
commit eb648679bf
2 changed files with 2 additions and 6 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) (JNIEnv *env, jclass clazz, jstring opPackageName)
{ {
ScopedUtfChars opPackageNameUtf(env, opPackageName); ScopedUtfChars opPackageNameUtf(env, opPackageName);
return (jlong) new SensorManager(String16(opPackageNameUtf.c_str())); return (jlong) &SensorManager::getInstanceForPackage(String16(opPackageNameUtf.c_str()));
} }
static jboolean static jboolean

6
native/android/sensor.cpp
View File

@@ -38,10 +38,6 @@ using android::String8;
using android::String16; using android::String16;
/*****************************************************************************/ /*****************************************************************************/
android::Mutex android::SensorManager::sLock;
std::map<String16, SensorManager*> android::SensorManager::sPackageInstances;
ASensorManager* ASensorManager_getInstance() ASensorManager* ASensorManager_getInstance()
{ {
return ASensorManager_getInstanceForPackage(NULL); return ASensorManager_getInstanceForPackage(NULL);
@@ -206,4 +202,4 @@ int ASensor_getReportingMode(ASensor const* sensor)
bool ASensor_isWakeUpSensor(ASensor const* sensor) bool ASensor_isWakeUpSensor(ASensor const* sensor)
{ {
return static_cast<Sensor const*>(sensor)->isWakeUpSensor(); return static_cast<Sensor const*>(sensor)->isWakeUpSensor();
} }