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

services/usb/java/com/android/server/usb/UsbHostManager.java

+9 −8

Original line number	Diff line number	Diff line
		@@ -34,9 +34,9 @@ import android.service.usb.UsbIsHeadsetProto;
		import android.text.TextUtils;
		import android.util.ArrayMap;
		import android.util.Slog;
		import android.util.StatsLog;

		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.util.FrameworkStatsLog;
		import com.android.internal.util.IndentingPrintWriter;
		import com.android.internal.util.dump.DualDumpOutputStream;
		import com.android.server.usb.descriptors.UsbDescriptor;
		@@ -418,10 +418,11 @@ public class UsbHostManager {
		parser.getRawDescriptors());

		// Stats collection
		StatsLog.write(StatsLog.USB_DEVICE_ATTACHED, newDevice.getVendorId(),
		newDevice.getProductId(), parser.hasAudioInterface(),
		parser.hasHIDInterface(), parser.hasStorageInterface(),
		StatsLog.USB_DEVICE_ATTACHED__STATE__STATE_CONNECTED, 0);
		FrameworkStatsLog.write(FrameworkStatsLog.USB_DEVICE_ATTACHED,
		newDevice.getVendorId(), newDevice.getProductId(),
		parser.hasAudioInterface(), parser.hasHIDInterface(),
		parser.hasStorageInterface(),
		FrameworkStatsLog.USB_DEVICE_ATTACHED__STATE__STATE_CONNECTED, 0);
		}
		}

		@@ -454,10 +455,10 @@ public class UsbHostManager {
		UsbDescriptorParser parser = new UsbDescriptorParser(deviceAddress,
		current.mDescriptors);
		// Stats collection
		StatsLog.write(StatsLog.USB_DEVICE_ATTACHED, device.getVendorId(),
		device.getProductId(), parser.hasAudioInterface(),
		FrameworkStatsLog.write(FrameworkStatsLog.USB_DEVICE_ATTACHED,
		device.getVendorId(), device.getProductId(), parser.hasAudioInterface(),
		parser.hasHIDInterface(), parser.hasStorageInterface(),
		StatsLog.USB_DEVICE_ATTACHED__STATE__STATE_DISCONNECTED,
		FrameworkStatsLog.USB_DEVICE_ATTACHED__STATE__STATE_DISCONNECTED,
		System.currentTimeMillis() - current.mTimestamp);
		}
		} else {

services/usb/java/com/android/server/usb/UsbPortManager.java

+9 −8

Original line number	Diff line number	Diff line
		@@ -66,11 +66,11 @@ import android.service.usb.UsbServiceProto;
		import android.util.ArrayMap;
		import android.util.Log;
		import android.util.Slog;
		import android.util.StatsLog;

		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.messages.nano.SystemMessageProto.SystemMessage;
		import com.android.internal.notification.SystemNotificationChannels;
		import com.android.internal.util.FrameworkStatsLog;
		import com.android.internal.util.IndentingPrintWriter;
		import com.android.internal.util.dump.DualDumpOutputStream;
		import com.android.server.FgThread;
		@@ -1040,8 +1040,9 @@ public class UsbPortManager {
		if (mConnected.containsKey(portInfo.mUsbPort.getId())) {
		//Previous logged a connected. Set it to disconnected.
		if (mConnected.get(portInfo.mUsbPort.getId())) {
		StatsLog.write(StatsLog.USB_CONNECTOR_STATE_CHANGED,
		StatsLog.USB_CONNECTOR_STATE_CHANGED__STATE__STATE_DISCONNECTED,
		FrameworkStatsLog.write(FrameworkStatsLog.USB_CONNECTOR_STATE_CHANGED,
		FrameworkStatsLog
		.USB_CONNECTOR_STATE_CHANGED__STATE__STATE_DISCONNECTED,
		portInfo.mUsbPort.getId(), portInfo.mLastConnectDurationMillis);
		}
		mConnected.remove(portInfo.mUsbPort.getId());
		@@ -1051,7 +1052,7 @@ public class UsbPortManager {
		//Previous logged a contaminant detected. Set it to not detected.
		if ((mContaminantStatus.get(portInfo.mUsbPort.getId())
		== UsbPortStatus.CONTAMINANT_DETECTION_DETECTED)) {
		StatsLog.write(StatsLog.USB_CONTAMINANT_REPORTED,
		FrameworkStatsLog.write(FrameworkStatsLog.USB_CONTAMINANT_REPORTED,
		portInfo.mUsbPort.getId(),
		convertContaminantDetectionStatusToProto(
		UsbPortStatus.CONTAMINANT_DETECTION_NOT_DETECTED));
		@@ -1065,10 +1066,10 @@ public class UsbPortManager {
		\|\| (mConnected.get(portInfo.mUsbPort.getId())
		!= portInfo.mUsbPortStatus.isConnected())) {
		mConnected.put(portInfo.mUsbPort.getId(), portInfo.mUsbPortStatus.isConnected());
		StatsLog.write(StatsLog.USB_CONNECTOR_STATE_CHANGED,
		FrameworkStatsLog.write(FrameworkStatsLog.USB_CONNECTOR_STATE_CHANGED,
		portInfo.mUsbPortStatus.isConnected()
		? StatsLog.USB_CONNECTOR_STATE_CHANGED__STATE__STATE_CONNECTED :
		StatsLog.USB_CONNECTOR_STATE_CHANGED__STATE__STATE_DISCONNECTED,
		? FrameworkStatsLog.USB_CONNECTOR_STATE_CHANGED__STATE__STATE_CONNECTED :
		FrameworkStatsLog.USB_CONNECTOR_STATE_CHANGED__STATE__STATE_DISCONNECTED,
		portInfo.mUsbPort.getId(), portInfo.mLastConnectDurationMillis);
		}

		@@ -1077,7 +1078,7 @@ public class UsbPortManager {
		!= portInfo.mUsbPortStatus.getContaminantDetectionStatus())) {
		mContaminantStatus.put(portInfo.mUsbPort.getId(),
		portInfo.mUsbPortStatus.getContaminantDetectionStatus());
		StatsLog.write(StatsLog.USB_CONTAMINANT_REPORTED,
		FrameworkStatsLog.write(FrameworkStatsLog.USB_CONTAMINANT_REPORTED,
		portInfo.mUsbPort.getId(),
		convertContaminantDetectionStatusToProto(
		portInfo.mUsbPortStatus.getContaminantDetectionStatus()));