diff options
5 files changed, 15 insertions, 5 deletions
diff --git a/services/core/java/com/android/server/location/geofence/GeofenceManager.java b/services/core/java/com/android/server/location/geofence/GeofenceManager.java index 5a90fa7a271c..7f47805ee121 100644 --- a/services/core/java/com/android/server/location/geofence/GeofenceManager.java +++ b/services/core/java/com/android/server/location/geofence/GeofenceManager.java @@ -370,6 +370,7 @@ public class GeofenceManager extends LocationStatsEnums.USAGE_ENDED, LocationStatsEnums.API_REQUEST_GEOFENCE, registration.getIdentity().getPackageName(), + registration.getIdentity().getAttributionTag(), null, /* LocationRequest= */ null, /* hasListener= */ false, @@ -383,6 +384,7 @@ public class GeofenceManager extends LocationStatsEnums.USAGE_ENDED, LocationStatsEnums.API_REQUEST_GEOFENCE, registration.getIdentity().getPackageName(), + registration.getIdentity().getAttributionTag(), null, /* LocationRequest= */ null, /* hasListener= */ false, diff --git a/services/core/java/com/android/server/location/gnss/GnssMeasurementsProvider.java b/services/core/java/com/android/server/location/gnss/GnssMeasurementsProvider.java index b3119d7aa53e..8460d6797543 100644 --- a/services/core/java/com/android/server/location/gnss/GnssMeasurementsProvider.java +++ b/services/core/java/com/android/server/location/gnss/GnssMeasurementsProvider.java @@ -189,6 +189,7 @@ public final class GnssMeasurementsProvider extends LocationStatsEnums.USAGE_STARTED, LocationStatsEnums.API_ADD_GNSS_MEASUREMENTS_LISTENER, registration.getIdentity().getPackageName(), + registration.getIdentity().getAttributionTag(), null, null, true, @@ -202,6 +203,7 @@ public final class GnssMeasurementsProvider extends LocationStatsEnums.USAGE_ENDED, LocationStatsEnums.API_ADD_GNSS_MEASUREMENTS_LISTENER, registration.getIdentity().getPackageName(), + registration.getIdentity().getAttributionTag(), null, null, true, diff --git a/services/core/java/com/android/server/location/gnss/GnssStatusProvider.java b/services/core/java/com/android/server/location/gnss/GnssStatusProvider.java index 1eb16184685d..936283deda8e 100644 --- a/services/core/java/com/android/server/location/gnss/GnssStatusProvider.java +++ b/services/core/java/com/android/server/location/gnss/GnssStatusProvider.java @@ -83,6 +83,7 @@ public class GnssStatusProvider extends LocationStatsEnums.USAGE_STARTED, LocationStatsEnums.API_REGISTER_GNSS_STATUS_CALLBACK, registration.getIdentity().getPackageName(), + registration.getIdentity().getAttributionTag(), null, null, true, @@ -96,6 +97,7 @@ public class GnssStatusProvider extends LocationStatsEnums.USAGE_ENDED, LocationStatsEnums.API_REGISTER_GNSS_STATUS_CALLBACK, registration.getIdentity().getPackageName(), + registration.getIdentity().getAttributionTag(), null, null, true, diff --git a/services/core/java/com/android/server/location/injector/LocationUsageLogger.java b/services/core/java/com/android/server/location/injector/LocationUsageLogger.java index 244a8e0daca0..af21bcbfb0ef 100644 --- a/services/core/java/com/android/server/location/injector/LocationUsageLogger.java +++ b/services/core/java/com/android/server/location/injector/LocationUsageLogger.java @@ -49,9 +49,9 @@ public class LocationUsageLogger { * Log a location API usage event. */ public void logLocationApiUsage(int usageType, int apiInUse, - String packageName, String provider, LocationRequest locationRequest, - boolean hasListener, boolean hasIntent, - Geofence geofence, boolean foreground) { + String packageName, String attributionTag, String provider, + LocationRequest locationRequest, boolean hasListener, + boolean hasIntent, Geofence geofence, boolean foreground) { try { if (hitApiUsageLogCap()) { return; @@ -84,7 +84,8 @@ public class LocationUsageLogger { isGeofenceNull ? LocationStatsEnums.RADIUS_UNKNOWN : bucketizeRadius(geofence.getRadius()), - categorizeActivityImportance(foreground)); + categorizeActivityImportance(foreground), + attributionTag); } catch (Exception e) { // Swallow exceptions to avoid crashing LMS. Log.w(TAG, "Failed to log API usage to statsd.", e); @@ -114,7 +115,8 @@ public class LocationUsageLogger { /* isListenerNull= */ true, /* isIntentNull= */ true), /* bucketizedRadius= */ 0, - LocationStatsEnums.IMPORTANCE_UNKNOWN); + LocationStatsEnums.IMPORTANCE_UNKNOWN, + /* attribution_tag */ null); } catch (Exception e) { Log.w(TAG, "Failed to log API usage to statsd.", e); } diff --git a/services/core/java/com/android/server/location/provider/LocationProviderManager.java b/services/core/java/com/android/server/location/provider/LocationProviderManager.java index 2aa6f2869afb..dc8b1d001c74 100644 --- a/services/core/java/com/android/server/location/provider/LocationProviderManager.java +++ b/services/core/java/com/android/server/location/provider/LocationProviderManager.java @@ -1854,6 +1854,7 @@ public class LocationProviderManager extends LocationStatsEnums.USAGE_STARTED, LocationStatsEnums.API_REQUEST_LOCATION_UPDATES, registration.getIdentity().getPackageName(), + registration.getIdentity().getAttributionTag(), mName, registration.getRequest(), key instanceof PendingIntent, @@ -1882,6 +1883,7 @@ public class LocationProviderManager extends LocationStatsEnums.USAGE_ENDED, LocationStatsEnums.API_REQUEST_LOCATION_UPDATES, registration.getIdentity().getPackageName(), + registration.getIdentity().getAttributionTag(), mName, registration.getRequest(), key instanceof PendingIntent, |