Migrate pullMobileBytesTransferBackground (89864441) · Commits · e / os / android_frameworks_base

apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java

+0 −83

Original line number	Diff line number	Diff line
		@@ -714,60 +714,6 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
		}
		}

		private void addNetworkStats(
		int tag, List<StatsLogEventWrapper> ret, NetworkStats stats, boolean withFGBG) {
		int size = stats.size();
		long elapsedNanos = SystemClock.elapsedRealtimeNanos();
		long wallClockNanos = SystemClock.currentTimeMicro() * 1000L;
		NetworkStats.Entry entry = new NetworkStats.Entry(); // For recycling
		for (int j = 0; j < size; j++) {
		stats.getValues(j, entry);
		StatsLogEventWrapper e = new StatsLogEventWrapper(tag, elapsedNanos, wallClockNanos);
		e.writeInt(entry.uid);
		if (withFGBG) {
		e.writeInt(entry.set);
		}
		e.writeLong(entry.rxBytes);
		e.writeLong(entry.rxPackets);
		e.writeLong(entry.txBytes);
		e.writeLong(entry.txPackets);
		ret.add(e);
		}
		}

		/**
		* Allows rollups per UID but keeping the set (foreground/background) slicing.
		* Adapted from groupedByUid in frameworks/base/core/java/android/net/NetworkStats.java
		*/
		private NetworkStats rollupNetworkStatsByFGBG(NetworkStats stats) {
		final NetworkStats ret = new NetworkStats(stats.getElapsedRealtime(), 1);

		final NetworkStats.Entry entry = new NetworkStats.Entry();
		entry.iface = NetworkStats.IFACE_ALL;
		entry.tag = NetworkStats.TAG_NONE;
		entry.metered = NetworkStats.METERED_ALL;
		entry.roaming = NetworkStats.ROAMING_ALL;

		int size = stats.size();
		NetworkStats.Entry recycle = new NetworkStats.Entry(); // Used for retrieving values
		for (int i = 0; i < size; i++) {
		stats.getValues(i, recycle);

		// Skip specific tags, since already counted in TAG_NONE
		if (recycle.tag != NetworkStats.TAG_NONE) continue;

		entry.set = recycle.set; // Allows slicing by background/foreground
		entry.uid = recycle.uid;
		entry.rxBytes = recycle.rxBytes;
		entry.rxPackets = recycle.rxPackets;
		entry.txBytes = recycle.txBytes;
		entry.txPackets = recycle.txPackets;
		// Operations purposefully omitted since we don't use them for statsd.
		ret.combineValues(entry);
		}
		return ret;
		}

		/**
		* Helper method to extract the Parcelable controller info from a
		* SynchronousResultReceiver.
		@@ -831,30 +777,6 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
		}
		}

		private void pullMobileBytesTransferByFgBg(
		int tagId, long elapsedNanos, long wallClockNanos,
		List<StatsLogEventWrapper> pulledData) {
		long token = Binder.clearCallingIdentity();
		try {
		BatteryStatsInternal bs = LocalServices.getService(BatteryStatsInternal.class);
		String[] ifaces = bs.getMobileIfaces();
		if (ifaces.length == 0) {
		return;
		}
		if (mNetworkStatsService == null) {
		Slog.e(TAG, "NetworkStats Service is not available!");
		return;
		}
		NetworkStats stats = rollupNetworkStatsByFGBG(
		mNetworkStatsService.getDetailedUidStats(ifaces));
		addNetworkStats(tagId, pulledData, stats, true);
		} catch (RemoteException e) {
		Slog.e(TAG, "Pulling netstats for mobile bytes w/ fg/bg has error", e);
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}

		private void pullCpuTimePerFreq(
		int tagId, long elapsedNanos, long wallClockNanos,
		List<StatsLogEventWrapper> pulledData) {
		@@ -2244,11 +2166,6 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
		long wallClockNanos = SystemClock.currentTimeMicro() * 1000L;
		switch (tagId) {

		case StatsLog.MOBILE_BYTES_TRANSFER_BY_FG_BG: {
		pullMobileBytesTransferByFgBg(tagId, elapsedNanos, wallClockNanos, ret);
		break;
		}

		case StatsLog.BLUETOOTH_BYTES_TRANSFER: {
		pullBluetoothBytesTransfer(tagId, elapsedNanos, wallClockNanos, ret);
		break;

cmds/statsd/src/external/StatsPullerManager.cpp

+0 −6

Original line number	Diff line number	Diff line
		@@ -60,12 +60,6 @@ const int64_t NO_ALARM_UPDATE = INT64_MAX;

		std::map<PullerKey, PullAtomInfo> StatsPullerManager::kAllPullAtomInfo = {

		// mobile_bytes_transfer_by_fg_bg
		{{.atomTag = android::util::MOBILE_BYTES_TRANSFER_BY_FG_BG},
		{.additiveFields = {3, 4, 5, 6},
		.puller =
		new StatsCompanionServicePuller(android::util::MOBILE_BYTES_TRANSFER_BY_FG_BG)}},

		// bluetooth_bytes_transfer
		{{.atomTag = android::util::BLUETOOTH_BYTES_TRANSFER},
		{.additiveFields = {2, 3},

services/core/java/com/android/server/stats/StatsPullAtomService.java

+33 −3

Original line number	Diff line number	Diff line
		@@ -494,11 +494,41 @@ public class StatsPullAtomService extends SystemService {
		}

		private void registerMobileBytesTransferBackground() {
		// No op.
		int tagId = StatsLog.MOBILE_BYTES_TRANSFER_BY_FG_BG;
		PullAtomMetadata metadata = PullAtomMetadata.newBuilder()
		.setAdditiveFields(new int[] {3, 4, 5, 6})
		.build();
		mStatsManager.registerPullAtomCallback(
		tagId,
		metadata,
		(atomTag, data) -> pullMobileBytesTransferBackground(atomTag, data),
		Executors.newSingleThreadExecutor()
		);
		}

		private void pullMobileBytesTransferBackground() {
		// No op.
		private int pullMobileBytesTransferBackground(int atomTag, List<StatsEvent> pulledData) {
		INetworkStatsService networkStatsService = getINetworkStatsService();
		if (networkStatsService == null) {
		Slog.e(TAG, "NetworkStats Service is not available!");
		return StatsManager.PULL_SKIP;
		}
		long token = Binder.clearCallingIdentity();
		try {
		BatteryStatsInternal bs = LocalServices.getService(BatteryStatsInternal.class);
		String[] ifaces = bs.getMobileIfaces();
		if (ifaces.length == 0) {
		return StatsManager.PULL_SKIP;
		}
		NetworkStats stats = rollupNetworkStatsByFGBG(
		networkStatsService.getDetailedUidStats(ifaces));
		addNetworkStats(atomTag, pulledData, stats, true);
		} catch (RemoteException e) {
		Slog.e(TAG, "Pulling netstats for mobile bytes w/ fg/bg has error", e);
		return StatsManager.PULL_SKIP;
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		return StatsManager.PULL_SUCCESS;
		}

		private void registerBluetoothBytesTransfer() {