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

Commit 747d2520 authored by Enrico Granata's avatar Enrico Granata Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-0dab591a2da0487e86ae54ea1577f29a" into sc-v2-dev-plus-aosp 

* changes:
  [automerge] Support vendor GNSS file properties for AAOS virtualization 2p: 9447139c
  Support vendor GNSS file properties for AAOS virtualization
parents 6d588b7c 081068a8

gnss/common/utils/default/GnssReplayUtils.cpp

+24 −6
Original line number Diff line number Diff line
@@ -16,24 +16,42 @@ 


#include "GnssReplayUtils.h"



#include <array>



namespace android {

namespace hardware {

namespace gnss {

namespace common {



std::string ReplayUtils::getGnssPath() {

    char devname_value[PROPERTY_VALUE_MAX] = "";

    if (property_get("debug.location.gnss.devname", devname_value, NULL) > 0) {

        return devname_value;

    std::array<char, PROPERTY_VALUE_MAX> devname_value;



    devname_value.fill(0);

    if (property_get("debug.location.gnss.devname", devname_value.begin(), NULL) > 0) {

        return devname_value.begin();

    }



    devname_value.fill(0);

    if (property_get("vendor.ser.gnss-uart", devname_value.begin(), NULL) > 0) {

        return devname_value.begin();

    }



    return GNSS_PATH;

}



std::string ReplayUtils::getFixedLocationPath() {

    char devname_value[PROPERTY_VALUE_MAX] = "";

    if (property_get("debug.location.fixedlocation.devname", devname_value, NULL) > 0) {

        return devname_value;

    std::array<char, PROPERTY_VALUE_MAX> devname_value;



    devname_value.fill(0);

    if (property_get("debug.location.fixedlocation.devname", devname_value.begin(), NULL) > 0) {

        return devname_value.begin();

    }



    devname_value.fill(0);

    if (property_get("vendor.ser.gnss-uart", devname_value.begin(), NULL) > 0) {

        return devname_value.begin();

    }



    return FIXED_LOCATION_PATH;

}