diff options
| author | Aravind Akella <aakella@google.com> | 2015-07-01 17:39:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-01 17:39:57 +0000 |
| commit | 32207e3c66f9b7979a6d465b87eb531327916081 (patch) | |
| tree | 68266efdef4afe23f00f06f14fdc274a2e440c80 /core/jni | |
| parent | 0794acc557f52960e52b369c6e4e5bf0bc575d02 (diff) | |
| parent | d123b51f8b14047804612cb1b15288cca81ed4f9 (diff) | |
| download | frameworks_base-32207e3c66f9b7979a6d465b87eb531327916081.zip frameworks_base-32207e3c66f9b7979a6d465b87eb531327916081.tar.gz frameworks_base-32207e3c66f9b7979a6d465b87eb531327916081.tar.bz2 | |
Merge "Changes to Data Injection mode APIs" into mnc-dev
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android_hardware_SensorManager.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/core/jni/android_hardware_SensorManager.cpp b/core/jni/android_hardware_SensorManager.cpp index c9d609c..1356c99 100644 --- a/core/jni/android_hardware_SensorManager.cpp +++ b/core/jni/android_hardware_SensorManager.cpp @@ -130,7 +130,6 @@ getInternedString(JNIEnv *env, const String8* string) { internedStrings.insert(std::make_pair(string, internedString)); env->DeleteLocalRef(localString); } - return internedString; } @@ -182,10 +181,9 @@ nativeGetNextSensor(JNIEnv *env, jclass clazz, jlong sensorManager, jobject sens return size_t(next) < count ? next : 0; } -static int nativeEnableDataInjection(JNIEnv *_env, jclass _this, jlong sensorManager, - jboolean enable) { +static jboolean nativeIsDataInjectionEnabled(JNIEnv *_env, jclass _this, jlong sensorManager) { SensorManager* mgr = reinterpret_cast<SensorManager*>(sensorManager); - return mgr->enableDataInjection(enable); + return mgr->isDataInjectionEnabled(); } //---------------------------------------------------------------------------- @@ -358,9 +356,9 @@ static JNINativeMethod gSystemSensorManagerMethods[] = { "(JLandroid/hardware/Sensor;I)I", (void*)nativeGetNextSensor }, - {"nativeEnableDataInjection", - "(JZ)I", - (void*)nativeEnableDataInjection }, + {"nativeIsDataInjectionEnabled", + "(J)Z", + (void*)nativeIsDataInjectionEnabled}, }; static JNINativeMethod gBaseEventQueueMethods[] = { |