diff options
| author | Narayan Kamath <narayan@google.com> | 2015-07-29 09:41:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-29 09:41:22 +0000 |
| commit | 7157c2ca81cb2c942a1e94cf1a0344babf6a8bd6 (patch) | |
| tree | bbbeb351bba53cbc5b1e77364ff28def23e45925 | |
| parent | 50184147fc35d5d441ae24661531819cc6cc025f (diff) | |
| parent | 8d1e344f400fa35f3ddfef78a1dd1d805f3718b0 (diff) | |
| download | frameworks_base-7157c2ca81cb2c942a1e94cf1a0344babf6a8bd6.zip frameworks_base-7157c2ca81cb2c942a1e94cf1a0344babf6a8bd6.tar.gz frameworks_base-7157c2ca81cb2c942a1e94cf1a0344babf6a8bd6.tar.bz2 | |
Merge "Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."" into mnc-dev
| -rw-r--r-- | core/jni/android_hardware_SensorManager.cpp | 2 | ||||
| -rw-r--r-- | native/android/sensor.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/core/jni/android_hardware_SensorManager.cpp b/core/jni/android_hardware_SensorManager.cpp index 7d0afdc..ec56507 100644 --- 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) &SensorManager::getInstanceForPackage(String16(opPackageNameUtf.c_str())); + return (jlong) new SensorManager(String16(opPackageNameUtf.c_str())); } static jboolean diff --git a/native/android/sensor.cpp b/native/android/sensor.cpp index ca49476..26b41e8 100644 --- a/native/android/sensor.cpp +++ b/native/android/sensor.cpp @@ -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(); -} +}
\ No newline at end of file |