summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-06-23 14:13:57 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-06-23 14:13:57 +0000
commit05bf24a6c87f21afcc44e9e684ec95b330366b5e (patch)
tree31e256d0a1a89f5ee1313108659029785018701f
parent16868fbef078bd760b6bc0cae59f4bc4be5fe3f0 (diff)
parent5793913249c15d0a420e7f432962a0a04410ad0a (diff)
Merge "Ignore enableFullTracking in HAL v1.0" into rvc-dev
-rw-r--r--services/core/jni/com_android_server_location_GnssLocationProvider.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
index c7dac787c653..465a3518ab65 100644
--- a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
+++ b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
@@ -3109,9 +3109,7 @@ static jboolean android_location_GnssMeasurementsProvider_start_measurement_coll
result = gnssMeasurementIface_V1_1->setCallback_1_1(cbIface, enableFullTracking);
} else {
if (enableFullTracking == JNI_TRUE) {
- // full tracking mode not supported in 1.0 HAL
- result.assertOk(); // isOk() must be called before result destructor is invoked.
- return JNI_FALSE;
+ ALOGW("Full tracking mode not supported in 1.0 GNSS HAL.");
}
result = gnssMeasurementIface->setCallback(cbIface);
}