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

Commit e1f28247 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Set elapsedRealtime if HAL doesn't set it" into tm-qpr-dev am: 9421ed72 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19970929



Change-Id: I1bb50d40edeb3fe962f8041fdce591fd1b4eed72
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6bd6a90e 9421ed72

services/core/jni/gnss/Utils.cpp

+2 −0
Original line number Original line Diff line number Diff line
@@ -195,6 +195,8 @@ jobject translateGnssLocation(JNIEnv* env, const android::hardware::gnss::GnssLo 
    flags = static_cast<uint32_t>(location.elapsedRealtime.flags);

    flags = static_cast<uint32_t>(location.elapsedRealtime.flags);

    if (flags & android::hardware::gnss::ElapsedRealtime::HAS_TIMESTAMP_NS) {

    if (flags & android::hardware::gnss::ElapsedRealtime::HAS_TIMESTAMP_NS) {

        SET(ElapsedRealtimeNanos, location.elapsedRealtime.timestampNs);

        SET(ElapsedRealtimeNanos, location.elapsedRealtime.timestampNs);

    } else {

        SET(ElapsedRealtimeNanos, android::elapsedRealtimeNano());

    }

    }

    if (flags & android::hardware::gnss::ElapsedRealtime::HAS_TIME_UNCERTAINTY_NS) {

    if (flags & android::hardware::gnss::ElapsedRealtime::HAS_TIME_UNCERTAINTY_NS) {

        SET(ElapsedRealtimeUncertaintyNanos,

        SET(ElapsedRealtimeUncertaintyNanos,