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

Merge "Fixes to FlpHal JNI layer." into klp-dev

Browse Source
This commit is contained in:
destradaa
2013-08-22 19:37:37 +00:00
committed by Android (Google) Code Review
parent 198bc229c3 264705a3f6
commit d5deafa45f
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/jni/com_android_server_location_FlpHardwareProvider.cpp
View File

@@ -14,7 +14,7 @@
* limitations under the license. * limitations under the license.
*/ */
#define LOG_TAG "FuseLocationProvider" #define LOG_TAG "FlpHardwareProvider"
#define LOG_NDEBUG 0 #define LOG_NDEBUG 0
#define WAKE_LOCK_NAME "FLP" #define WAKE_LOCK_NAME "FLP"
@@ -65,8 +65,7 @@ static inline void ThrowOnError(
} }
ALOGE("Error %d in '%s'", resultCode, methodName); ALOGE("Error %d in '%s'", resultCode, methodName);
jclass exceptionClass = env->FindClass("java/lang/RuntimeException"); env->FatalError(methodName);
env->ThrowNew(exceptionClass, methodName);
} }
static bool IsValidCallbackThread() { static bool IsValidCallbackThread() {
@@ -768,7 +767,7 @@ static void InjectLocation(JNIEnv* env, jobject object, jobject locationObject)
FlpLocation location; FlpLocation location;
TranslateFromObject(env, locationObject, location); TranslateFromObject(env, locationObject, location);
int result = sFlpInterface->inject_location(&location); int result = sFlpInterface->inject_location(&location);
if (result != FLP_RESULT_ERROR) { if (result != FLP_RESULT_SUCCESS) {
// do not throw but log, this operation should be fire and forget // do not throw but log, this operation should be fire and forget
ALOGE("Error %d in '%s'", result, __FUNCTION__); ALOGE("Error %d in '%s'", result, __FUNCTION__);
} }