Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix location API usage for API_ADD_GNSS_MEASUREMENTS_LISTENER" into qt-dev

Browse Source 
am: a1d0453641

Change-Id: I1ae1f1c463e21ab56106390e72030fd637bf45fc
This commit is contained in:
Hongyi Zhang
2019-06-04 12:49:22 -07:00
committed by android-build-merger
parent 00e482d84e a1d0453641
commit 01d0acfed0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/LocationManagerService.java
View File

@@ -2962,11 +2962,11 @@ public class LocationManagerService extends ILocationManager.Stub {
gnssDataListeners.put(binder, linkedListener); gnssDataListeners.put(binder, linkedListener);
long identity = Binder.clearCallingIdentity(); long identity = Binder.clearCallingIdentity();
try { try {
if (gnssDataProvider == mGnssNavigationMessageProvider if (gnssDataProvider == mGnssMeasurementsProvider
|| gnssDataProvider == mGnssStatusProvider) { || gnssDataProvider == mGnssStatusProvider) {
mLocationUsageLogger.logLocationApiUsage( mLocationUsageLogger.logLocationApiUsage(
LocationStatsEnums.USAGE_STARTED, LocationStatsEnums.USAGE_STARTED,
gnssDataProvider == mGnssNavigationMessageProvider gnssDataProvider == mGnssMeasurementsProvider
? LocationStatsEnums.API_ADD_GNSS_MEASUREMENTS_LISTENER ? LocationStatsEnums.API_ADD_GNSS_MEASUREMENTS_LISTENER
: LocationStatsEnums.API_REGISTER_GNSS_STATUS_CALLBACK, : LocationStatsEnums.API_REGISTER_GNSS_STATUS_CALLBACK,
packageName, packageName,
@@ -3003,11 +3003,11 @@ public class LocationManagerService extends ILocationManager.Stub {
} }
long identity = Binder.clearCallingIdentity(); long identity = Binder.clearCallingIdentity();
try { try {
if (gnssDataProvider == mGnssNavigationMessageProvider if (gnssDataProvider == mGnssMeasurementsProvider
|| gnssDataProvider == mGnssStatusProvider) { || gnssDataProvider == mGnssStatusProvider) {
mLocationUsageLogger.logLocationApiUsage( mLocationUsageLogger.logLocationApiUsage(
LocationStatsEnums.USAGE_ENDED, LocationStatsEnums.USAGE_ENDED,
gnssDataProvider == mGnssNavigationMessageProvider gnssDataProvider == mGnssMeasurementsProvider
? LocationStatsEnums.API_ADD_GNSS_MEASUREMENTS_LISTENER ? LocationStatsEnums.API_ADD_GNSS_MEASUREMENTS_LISTENER
: LocationStatsEnums.API_REGISTER_GNSS_STATUS_CALLBACK, : LocationStatsEnums.API_REGISTER_GNSS_STATUS_CALLBACK,
linkedListener.mCallerIdentity.mPackageName, linkedListener.mCallerIdentity.mPackageName,