Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4aac30fa authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am 8fcb5697: am ff01fcec: am 7157c2ca: Merge "Revert "Call... 

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

* commit '8fcb5697':
  Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."
parents 619b37a3 8fcb5697

core/jni/android_hardware_SensorManager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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

native/android/sensor.cpp

+4 −1
Original line number Diff line number Diff line
@@ -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);