From 5fc6fa657cf9eedbf435408c77b94f28f4df3412 Mon Sep 17 00:00:00 2001 From: Dante Russo Date: Fri, 9 Jun 2017 13:15:14 -0700 Subject: [PATCH] Fix NI for Notify and Verify being true CRs-fixed: 2059175 Bug: 62049857 Change-Id: I6c4717ddbd72f15972e5d4bd8897b528fbe2c2b4 --- android/location_api/GnssAPIClient.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/android/location_api/GnssAPIClient.cpp b/android/location_api/GnssAPIClient.cpp index 0e86c00c..02580b79 100644 --- a/android/location_api/GnssAPIClient.cpp +++ b/android/location_api/GnssAPIClient.cpp @@ -303,14 +303,13 @@ void GnssAPIClient::onGnssNiCb(uint32_t id, GnssNiNotification gnssNiNotificatio else if (gnssNiNotification.type == GNSS_NI_TYPE_CONTROL_PLANE) notificationGnss.niType = IGnssNiCallback::GnssNiType::UMTS_CTRL_PLANE; else if (gnssNiNotification.type == GNSS_NI_TYPE_EMERGENCY_SUPL) - notificationGnss.niType = - static_cast(4/*hardcode until IGnssNiCallback adds value*/); + notificationGnss.niType = IGnssNiCallback::GnssNiType::EMERGENCY_SUPL; if (gnssNiNotification.options & GNSS_NI_OPTIONS_NOTIFICATION_BIT) notificationGnss.notifyFlags |= IGnssNiCallback::GnssNiNotifyFlags::NEED_NOTIFY; - else if (gnssNiNotification.options & GNSS_NI_OPTIONS_VERIFICATION_BIT) + if (gnssNiNotification.options & GNSS_NI_OPTIONS_VERIFICATION_BIT) notificationGnss.notifyFlags |= IGnssNiCallback::GnssNiNotifyFlags::NEED_VERIFY; - else if (gnssNiNotification.options & GNSS_NI_OPTIONS_PRIVACY_OVERRIDE_BIT) + if (gnssNiNotification.options & GNSS_NI_OPTIONS_PRIVACY_OVERRIDE_BIT) notificationGnss.notifyFlags |= IGnssNiCallback::GnssNiNotifyFlags::PRIVACY_OVERRIDE; notificationGnss.timeoutSec = gnssNiNotification.timeout;