Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5363321 authored by Hongyi Zhang's avatar Hongyi Zhang Committed by android-build-merger
Browse files

Merge "Fix location API usage for API_ADD_GNSS_MEASUREMENTS_LISTENER" into... 

Merge "Fix location API usage for API_ADD_GNSS_MEASUREMENTS_LISTENER" into qt-dev am: a1d04536 am: 887d09db
am: a3790b9a

Change-Id: I8ccd5f250cf165e2e1a041c58296ae895efd73db
parents c0c0e0ce a3790b9a

services/core/java/com/android/server/LocationManagerService.java

+4 −4
Original line number Diff line number Diff line
@@ -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,