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

Commit 72a47a2e authored by Enrico Granata's avatar Enrico Granata
Browse files

Allow setting new values for mock speed and bearing in GNSS HAL 

Bug: None
Test: lshal debug android.hardware.gnss@2.1::IGnss/default location bea=30 spd=40
      on Cuttlefish instance
Change-Id: Ib954ba44720627e54e69aa29b0a744f203a65704
parent 6b085781

gnss/1.1/default/GnssDebug.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -37,8 +37,8 @@ Return<void> GnssDebug::getDebugData(V1_0::IGnssDebug::getDebugData_cb _hidl_cb) 
            .latitudeDegrees = gMockLatitudeDegrees,

            .latitudeDegrees = gMockLatitudeDegrees,

            .longitudeDegrees = gMockLongitudeDegrees,

            .longitudeDegrees = gMockLongitudeDegrees,

            .altitudeMeters = gMockAltitudeMeters,

            .altitudeMeters = gMockAltitudeMeters,

            .speedMetersPerSec = kMockSpeedMetersPerSec,

            .speedMetersPerSec = gMockSpeedMetersPerSec,

            .bearingDegrees = kMockBearingDegrees,

            .bearingDegrees = gMockBearingDegrees,

            .horizontalAccuracyMeters = kMockHorizontalAccuracyMeters,

            .horizontalAccuracyMeters = kMockHorizontalAccuracyMeters,

            .verticalAccuracyMeters = kMockVerticalAccuracyMeters,

            .verticalAccuracyMeters = kMockVerticalAccuracyMeters,

            .speedAccuracyMetersPerSecond = kMockSpeedAccuracyMetersPerSecond,

            .speedAccuracyMetersPerSecond = kMockSpeedAccuracyMetersPerSecond,

gnss/common/utils/default/MockLocation.cpp

+2 −0
Original line number Original line Diff line number Diff line
@@ -21,5 +21,7 @@ namespace android::hardware::gnss::common { 
float gMockLatitudeDegrees{37.4219999};

float gMockLatitudeDegrees{37.4219999};

float gMockLongitudeDegrees{-122.0840575};

float gMockLongitudeDegrees{-122.0840575};

float gMockAltitudeMeters{1.60062531};

float gMockAltitudeMeters{1.60062531};

float gMockBearingDegrees{0};

float gMockSpeedMetersPerSec{0};





}  // namespace android::hardware::gnss::common
 
}  // namespace android::hardware::gnss::common

gnss/common/utils/default/Utils.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -145,8 +145,8 @@ V1_0::GnssLocation Utils::getMockLocationV1_0() { 
            .latitudeDegrees = gMockLatitudeDegrees,

            .latitudeDegrees = gMockLatitudeDegrees,

            .longitudeDegrees = gMockLongitudeDegrees,

            .longitudeDegrees = gMockLongitudeDegrees,

            .altitudeMeters = gMockAltitudeMeters,

            .altitudeMeters = gMockAltitudeMeters,

            .speedMetersPerSec = kMockSpeedMetersPerSec,

            .speedMetersPerSec = gMockSpeedMetersPerSec,

            .bearingDegrees = kMockBearingDegrees,

            .bearingDegrees = gMockBearingDegrees,

            .horizontalAccuracyMeters = kMockHorizontalAccuracyMeters,

            .horizontalAccuracyMeters = kMockHorizontalAccuracyMeters,

            .verticalAccuracyMeters = kMockVerticalAccuracyMeters,

            .verticalAccuracyMeters = kMockVerticalAccuracyMeters,

            .speedAccuracyMetersPerSecond = kMockSpeedAccuracyMetersPerSecond,

            .speedAccuracyMetersPerSecond = kMockSpeedAccuracyMetersPerSecond,

gnss/common/utils/default/include/Constants.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -24,8 +24,6 @@ namespace hardware { 
namespace gnss {

namespace gnss {

namespace common {

namespace common {





const float kMockSpeedMetersPerSec = 0;

const float kMockBearingDegrees = 0;

const float kMockHorizontalAccuracyMeters = 5;

const float kMockHorizontalAccuracyMeters = 5;

const float kMockVerticalAccuracyMeters = 5;

const float kMockVerticalAccuracyMeters = 5;

const float kMockSpeedAccuracyMetersPerSecond = 1;

const float kMockSpeedAccuracyMetersPerSecond = 1;

gnss/common/utils/default/include/MockLocation.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,8 @@ namespace common { 
extern float gMockLatitudeDegrees;

extern float gMockLatitudeDegrees;

extern float gMockLongitudeDegrees;

extern float gMockLongitudeDegrees;

extern float gMockAltitudeMeters;

extern float gMockAltitudeMeters;

extern float gMockBearingDegrees;

extern float gMockSpeedMetersPerSec;





}  // namespace common

}  // namespace common

}  // namespace gnss

}  // namespace gnss