From ff1aeb3b6e41b5d7eae7b4779f5a167207b9b184 Mon Sep 17 00:00:00 2001
From: Hongyi Zhang <hongyiz@google.com>
Date: Mon, 3 Jun 2019 14:27:39 -0700
Subject: [PATCH] Fix location API usage for API_ADD_GNSS_MEASUREMENTS_LISTENER

fix a typo when comparing gnssDataProvider, which leads to a bug of
logging API usage of add/remove NavigationMessageListener as API_ADD_GNSS_MEASUREMENTS_LISTENER

Test: toggling button "Measurements" in apk Gnssloger
Bug: 133906682

Change-Id: I81c386ebba01ec89d73347a979d307fbcd7b3617
---
 .../java/com/android/server/LocationManagerService.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/services/core/java/com/android/server/LocationManagerService.java b/services/core/java/com/android/server/LocationManagerService.java
index ae04f76b95b4a..78f0603c53596 100644
--- a/services/core/java/com/android/server/LocationManagerService.java
+++ b/services/core/java/com/android/server/LocationManagerService.java
@@ -2962,11 +2962,11 @@ public class LocationManagerService extends ILocationManager.Stub {
             gnssDataListeners.put(binder, linkedListener);
             long identity = Binder.clearCallingIdentity();
             try {
-                if (gnssDataProvider == mGnssNavigationMessageProvider
+                if (gnssDataProvider == mGnssMeasurementsProvider
                         || gnssDataProvider == mGnssStatusProvider) {
                     mLocationUsageLogger.logLocationApiUsage(
                             LocationStatsEnums.USAGE_STARTED,
-                            gnssDataProvider == mGnssNavigationMessageProvider
+                            gnssDataProvider == mGnssMeasurementsProvider
                                 ? LocationStatsEnums.API_ADD_GNSS_MEASUREMENTS_LISTENER
                                 : LocationStatsEnums.API_REGISTER_GNSS_STATUS_CALLBACK,
                             packageName,
@@ -3003,11 +3003,11 @@ public class LocationManagerService extends ILocationManager.Stub {
             }
             long identity = Binder.clearCallingIdentity();
             try {
-                if (gnssDataProvider == mGnssNavigationMessageProvider
+                if (gnssDataProvider == mGnssMeasurementsProvider
                         || gnssDataProvider == mGnssStatusProvider) {
                     mLocationUsageLogger.logLocationApiUsage(
                             LocationStatsEnums.USAGE_ENDED,
-                            gnssDataProvider == mGnssNavigationMessageProvider
+                            gnssDataProvider == mGnssMeasurementsProvider
                                 ? LocationStatsEnums.API_ADD_GNSS_MEASUREMENTS_LISTENER
                                 : LocationStatsEnums.API_REGISTER_GNSS_STATUS_CALLBACK,
                             linkedListener.mCallerIdentity.mPackageName,