diff options
| author | qctecmdr <qctecmdr@localhost> | 2019-11-25 10:16:18 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-11-25 10:16:18 -0800 |
| commit | 6b13ac10f1f298e5e60d1239516cf7cda37a69dd (patch) | |
| tree | 64f7b796f3ce98bd9b4080e131b4687d16dd6028 | |
| parent | 01503d5e0ceab2033b17bba01f1fc04db61b8e94 (diff) | |
| parent | c7b6382ede2ada8cbe6d94a58fc27d91bf8da398 (diff) | |
| download | gps-6b13ac10f1f298e5e60d1239516cf7cda37a69dd.tar.gz | |
Merge "SUPL Version for 5G and LPP Rel 15"
| -rw-r--r-- | android/1.0/GnssConfiguration.cpp | 3 | ||||
| -rw-r--r-- | android/1.1/GnssConfiguration.cpp | 3 | ||||
| -rw-r--r-- | android/2.0/GnssConfiguration.cpp | 3 | ||||
| -rw-r--r-- | gnss/GnssAdapter.cpp | 2 | ||||
| -rw-r--r-- | location/LocationDataTypes.h | 1 |
5 files changed, 12 insertions, 0 deletions
diff --git a/android/1.0/GnssConfiguration.cpp b/android/1.0/GnssConfiguration.cpp index 0b62249..73c9d5c 100644 --- a/android/1.0/GnssConfiguration.cpp +++ b/android/1.0/GnssConfiguration.cpp @@ -65,6 +65,9 @@ Return<bool> GnssConfiguration::setSuplVersion(uint32_t version) { config.size = sizeof(GnssConfig); config.flags = GNSS_CONFIG_FLAGS_SUPL_VERSION_VALID_BIT; switch (version) { + case 0x00020004: + config.suplVersion = GNSS_CONFIG_SUPL_VERSION_2_0_4; + break; case 0x00020002: config.suplVersion = GNSS_CONFIG_SUPL_VERSION_2_0_2; break; diff --git a/android/1.1/GnssConfiguration.cpp b/android/1.1/GnssConfiguration.cpp index 93f9645..708e2c1 100644 --- a/android/1.1/GnssConfiguration.cpp +++ b/android/1.1/GnssConfiguration.cpp @@ -65,6 +65,9 @@ Return<bool> GnssConfiguration::setSuplVersion(uint32_t version) { config.size = sizeof(GnssConfig); config.flags = GNSS_CONFIG_FLAGS_SUPL_VERSION_VALID_BIT; switch (version) { + case 0x00020004: + config.suplVersion = GNSS_CONFIG_SUPL_VERSION_2_0_4; + break; case 0x00020002: config.suplVersion = GNSS_CONFIG_SUPL_VERSION_2_0_2; break; diff --git a/android/2.0/GnssConfiguration.cpp b/android/2.0/GnssConfiguration.cpp index 363d2b1..069c036 100644 --- a/android/2.0/GnssConfiguration.cpp +++ b/android/2.0/GnssConfiguration.cpp @@ -55,6 +55,9 @@ Return<bool> GnssConfiguration::setSuplVersion(uint32_t version) { config.size = sizeof(GnssConfig); config.flags = GNSS_CONFIG_FLAGS_SUPL_VERSION_VALID_BIT; switch (version) { + case 0x00020004: + config.suplVersion = GNSS_CONFIG_SUPL_VERSION_2_0_4; + break; case 0x00020002: config.suplVersion = GNSS_CONFIG_SUPL_VERSION_2_0_2; break; diff --git a/gnss/GnssAdapter.cpp b/gnss/GnssAdapter.cpp index 19dcb6d..0382f19 100644 --- a/gnss/GnssAdapter.cpp +++ b/gnss/GnssAdapter.cpp @@ -533,6 +533,8 @@ inline uint32_t GnssAdapter::convertSuplVersion(const GnssConfigSuplVersion suplVersion) { switch (suplVersion) { + case GNSS_CONFIG_SUPL_VERSION_2_0_4: + return 0x00020004; case GNSS_CONFIG_SUPL_VERSION_2_0_0: return 0x00020000; case GNSS_CONFIG_SUPL_VERSION_2_0_2: diff --git a/location/LocationDataTypes.h b/location/LocationDataTypes.h index 956754a..2fb35bf 100644 --- a/location/LocationDataTypes.h +++ b/location/LocationDataTypes.h @@ -248,6 +248,7 @@ typedef enum { GNSS_CONFIG_SUPL_VERSION_1_0_0 = 1, GNSS_CONFIG_SUPL_VERSION_2_0_0, GNSS_CONFIG_SUPL_VERSION_2_0_2, + GNSS_CONFIG_SUPL_VERSION_2_0_4, } GnssConfigSuplVersion; // LTE Positioning Profile |