Merge "Use FrameworkStatsLog instead of StatsLog" (c3f651ad) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/location/GnssConfiguration.java

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -23,7 +23,8 @@ import android.telephony.CarrierConfigManager;
	import android.telephony.SubscriptionManager;		import android.telephony.SubscriptionManager;
	import android.text.TextUtils;		import android.text.TextUtils;
	import android.util.Log;		import android.util.Log;
	import android.util.StatsLog;
			import com.android.internal.util.FrameworkStatsLog;

	import libcore.io.IoUtils;		import libcore.io.IoUtils;

	@@ -283,7 +284,7 @@ class GnssConfiguration {
	}		}

	private void logConfigurations() {		private void logConfigurations() {
	StatsLog.write(StatsLog.GNSS_CONFIGURATION_REPORTED,		FrameworkStatsLog.write(FrameworkStatsLog.GNSS_CONFIGURATION_REPORTED,
	getSuplHost(),		getSuplHost(),
	getSuplPort(0),		getSuplPort(0),
	getC2KHost(),		getC2KHost(),

services/core/java/com/android/server/location/GnssLocationProvider.java

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -63,7 +63,6 @@ import android.telephony.TelephonyManager;
	import android.telephony.gsm.GsmCellLocation;		import android.telephony.gsm.GsmCellLocation;
	import android.text.TextUtils;		import android.text.TextUtils;
	import android.util.Log;		import android.util.Log;
	import android.util.StatsLog;
	import android.util.TimeUtils;		import android.util.TimeUtils;

	import com.android.internal.annotations.GuardedBy;		import com.android.internal.annotations.GuardedBy;
	@@ -74,6 +73,7 @@ import com.android.internal.location.GpsNetInitiatedHandler.GpsNiNotification;
	import com.android.internal.location.ProviderProperties;		import com.android.internal.location.ProviderProperties;
	import com.android.internal.location.ProviderRequest;		import com.android.internal.location.ProviderRequest;
	import com.android.internal.location.gnssmetrics.GnssMetrics;		import com.android.internal.location.gnssmetrics.GnssMetrics;
			import com.android.internal.util.FrameworkStatsLog;
	import com.android.server.DeviceIdleInternal;		import com.android.server.DeviceIdleInternal;
	import com.android.server.FgThread;		import com.android.server.FgThread;
	import com.android.server.LocalServices;		import com.android.server.LocalServices;
	@@ -1825,8 +1825,8 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
	}		}
	native_send_ni_response(notificationId, userResponse);		native_send_ni_response(notificationId, userResponse);

	StatsLog.write(StatsLog.GNSS_NI_EVENT_REPORTED,		FrameworkStatsLog.write(FrameworkStatsLog.GNSS_NI_EVENT_REPORTED,
	StatsLog.GNSS_NI_EVENT_REPORTED__EVENT_TYPE__NI_RESPONSE,		FrameworkStatsLog.GNSS_NI_EVENT_REPORTED__EVENT_TYPE__NI_RESPONSE,
	notificationId,		notificationId,
	/* niType= */ 0,		/* niType= */ 0,
	/* needNotify= */ false,		/* needNotify= */ false,
	@@ -1891,8 +1891,8 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
	notification.textEncoding = textEncoding;		notification.textEncoding = textEncoding;

	mNIHandler.handleNiNotification(notification);		mNIHandler.handleNiNotification(notification);
	StatsLog.write(StatsLog.GNSS_NI_EVENT_REPORTED,		FrameworkStatsLog.write(FrameworkStatsLog.GNSS_NI_EVENT_REPORTED,
	StatsLog.GNSS_NI_EVENT_REPORTED__EVENT_TYPE__NI_REQUEST,		FrameworkStatsLog.GNSS_NI_EVENT_REPORTED__EVENT_TYPE__NI_REQUEST,
	notification.notificationId,		notification.notificationId,
	notification.niType,		notification.niType,
	notification.needNotify,		notification.needNotify,

services/core/java/com/android/server/location/GnssVisibilityControl.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -36,11 +36,11 @@ import android.os.UserHandle;
	import android.text.TextUtils;		import android.text.TextUtils;
	import android.util.ArrayMap;		import android.util.ArrayMap;
	import android.util.Log;		import android.util.Log;
	import android.util.StatsLog;

	import com.android.internal.R;		import com.android.internal.R;
	import com.android.internal.location.GpsNetInitiatedHandler;		import com.android.internal.location.GpsNetInitiatedHandler;
	import com.android.internal.notification.SystemNotificationChannels;		import com.android.internal.notification.SystemNotificationChannels;
			import com.android.internal.util.FrameworkStatsLog;

	import java.util.Arrays;		import java.util.Arrays;
	import java.util.List;		import java.util.List;
	@@ -650,7 +650,7 @@ class GnssVisibilityControl {
	}		}

	private void logEvent(NfwNotification notification, boolean isPermissionMismatched) {		private void logEvent(NfwNotification notification, boolean isPermissionMismatched) {
	StatsLog.write(StatsLog.GNSS_NFW_NOTIFICATION_REPORTED,		FrameworkStatsLog.write(FrameworkStatsLog.GNSS_NFW_NOTIFICATION_REPORTED,
	notification.mProxyAppPackageName,		notification.mProxyAppPackageName,
	notification.mProtocolStack,		notification.mProtocolStack,
	notification.mOtherProtocolStackName,		notification.mOtherProtocolStackName,

services/core/java/com/android/server/location/LocationUsageLogger.java

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -24,9 +24,9 @@ import android.location.LocationManager;
	import android.location.LocationRequest;		import android.location.LocationRequest;
	import android.stats.location.LocationStatsEnums;		import android.stats.location.LocationStatsEnums;
	import android.util.Log;		import android.util.Log;
	import android.util.StatsLog;

	import com.android.internal.annotations.GuardedBy;		import com.android.internal.annotations.GuardedBy;
			import com.android.internal.util.FrameworkStatsLog;

	import java.time.Instant;		import java.time.Instant;

	@@ -61,8 +61,8 @@ public class LocationUsageLogger {
	boolean isLocationRequestNull = locationRequest == null;		boolean isLocationRequestNull = locationRequest == null;
	boolean isGeofenceNull = geofence == null;		boolean isGeofenceNull = geofence == null;

	StatsLog.write(StatsLog.LOCATION_MANAGER_API_USAGE_REPORTED, usageType,		FrameworkStatsLog.write(FrameworkStatsLog.LOCATION_MANAGER_API_USAGE_REPORTED,
	apiInUse, packageName,		usageType, apiInUse, packageName,
	isLocationRequestNull		isLocationRequestNull
	? LocationStatsEnums.PROVIDER_UNKNOWN		? LocationStatsEnums.PROVIDER_UNKNOWN
	: bucketizeProvider(locationRequest.getProvider()),		: bucketizeProvider(locationRequest.getProvider()),
	@@ -101,7 +101,8 @@ public class LocationUsageLogger {
	return;		return;
	}		}

	StatsLog.write(StatsLog.LOCATION_MANAGER_API_USAGE_REPORTED, usageType, apiInUse,		FrameworkStatsLog.write(FrameworkStatsLog.LOCATION_MANAGER_API_USAGE_REPORTED,
			usageType, apiInUse,
	/* package_name= */ null,		/* package_name= */ null,
	bucketizeProvider(providerName),		bucketizeProvider(providerName),
	LocationStatsEnums.QUALITY_UNKNOWN,		LocationStatsEnums.QUALITY_UNKNOWN,