Bladeren bron

sm8450-common: gps: Let qualityLevelAccepted use loc_sess_status enum

device/xiaomi/sm8450-common/gps/gnss/GnssAdapter.cpp:4111:49: error: comparison of different enumeration types ('FixQualityLevel' and 'enum loc_sess_status') [-Werror,-Wenum-compare]
                it->second.qualityLevelAccepted >= status) {
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^  ~~~~~~

Change-Id: I9decccb88a51760806eab080d5ad92d90d9b87cd
Arian 1 jaar geleden
bovenliggende
commit
946f3651cd
1 gewijzigde bestanden met toevoegingen van 7 en 13 verwijderingen
  1. 7 13
      gps/location/LocationDataTypes.h

+ 7 - 13
gps/location/LocationDataTypes.h

@@ -1034,11 +1034,11 @@ typedef enum {
     LOC_OUTPUT_ENGINE_COUNT,
 } LocOutputEngineType;
 
-typedef enum {
-    QUALITY_HIGH_ACCU_FIX_ONLY = 0,       /* Only allow valid fix with high accuracy */
-    QUALITY_ANY_VALID_FIX,                /* Allow fix with any accuracy, like intermediate fix */
-    QUALITY_ANY_OR_FAILED_FIX,            /* Allow fix of any type, even failed fix */
-} FixQualityLevel;
+enum loc_sess_status {
+    LOC_SESS_SUCCESS,
+    LOC_SESS_INTERMEDIATE,
+    LOC_SESS_FAILURE
+};
 
 struct LocationOptions {
     uint32_t size;          // set to sizeof(LocationOptions)
@@ -1050,12 +1050,12 @@ struct LocationOptions {
     //  if engine hub is running, this will be fused fix,
     //  if engine hub is not running, this will be SPE fix
     LocReqEngineTypeMask locReqEngTypeMask;
-    FixQualityLevel qualityLevelAccepted; /* Send through position reports with which accuracy. */
+    loc_sess_status qualityLevelAccepted; /* Send through position reports with which accuracy. */
 
     inline LocationOptions() :
             size(0), minInterval(0), minDistance(0), mode(GNSS_SUPL_MODE_STANDALONE),
             locReqEngTypeMask((LocReqEngineTypeMask)0),
-            qualityLevelAccepted(QUALITY_HIGH_ACCU_FIX_ONLY) {}
+            qualityLevelAccepted(LOC_SESS_SUCCESS) {}
 };
 
 typedef enum {
@@ -1310,12 +1310,6 @@ typedef struct {
     float altitude;  // altitude wrt to ellipsoid
 } LLAInfo;
 
-enum loc_sess_status {
-    LOC_SESS_SUCCESS,
-    LOC_SESS_INTERMEDIATE,
-    LOC_SESS_FAILURE
-};
-
 typedef struct {
     uint32_t size;                      // set to sizeof(GnssLocationInfo)
     Location location;                  // basic locaiton info, latitude, longitude, and etc