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

Commit c8785421 authored by Jeffrey Huang's avatar Jeffrey Huang
Browse files

Migrate pullMobileBytesTransfer 

Bug: 145565211
Test: No Cts test. Ran adb shell cmd stats pull-source 10002
Change-Id: I70b005a4a08eaa33d0cfdd21580fa1ea0c8eed6d
parent acaee0fd

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

+0 −29
Original line number Diff line number Diff line
@@ -815,30 +815,6 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { 
        }

    }



    private void pullMobileBytesTransfer(

            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;

            }

            // Combine all the metrics per Uid into one record.

            NetworkStats stats = mNetworkStatsService.getDetailedUidStats(ifaces).groupedByUid();

            addNetworkStats(tagId, pulledData, stats, false);

        } catch (RemoteException e) {

            Slog.e(TAG, "Pulling netstats for mobile bytes has error", e);

        } finally {

            Binder.restoreCallingIdentity(token);

        }

    }



    private void pullBluetoothBytesTransfer(

            int tagId, long elapsedNanos, long wallClockNanos,

            List<StatsLogEventWrapper> pulledData) {
@@ -2268,11 +2244,6 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { 
        long wallClockNanos = SystemClock.currentTimeMicro() * 1000L;

        switch (tagId) {



            case StatsLog.MOBILE_BYTES_TRANSFER: {

                pullMobileBytesTransfer(tagId, elapsedNanos, wallClockNanos, ret);

                break;

            }



            case StatsLog.MOBILE_BYTES_TRANSFER_BY_FG_BG: {

                pullMobileBytesTransferByFgBg(tagId, elapsedNanos, wallClockNanos, ret);

                break;

cmds/statsd/src/external/StatsPullerManager.cpp

+0 −5
Original line number Diff line number Diff line
@@ -60,11 +60,6 @@ const int64_t NO_ALARM_UPDATE = INT64_MAX; 


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



        // mobile_bytes_transfer

        {{.atomTag = android::util::MOBILE_BYTES_TRANSFER},

         {.additiveFields = {2, 3, 4, 5},

          .puller = new StatsCompanionServicePuller(android::util::MOBILE_BYTES_TRANSFER)}},



        // mobile_bytes_transfer_by_fg_bg

        {{.atomTag = android::util::MOBILE_BYTES_TRANSFER_BY_FG_BG},

         {.additiveFields = {3, 4, 5, 6},

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

+33 −3
Original line number Diff line number Diff line
@@ -456,11 +456,41 @@ public class StatsPullAtomService extends SystemService { 
    }



    private void registerMobileBytesTransfer() {

        // No op.

        int tagId = StatsLog.MOBILE_BYTES_TRANSFER;

        PullAtomMetadata metadata = PullAtomMetadata.newBuilder()

                .setAdditiveFields(new int[] {2, 3, 4, 5})

                .build();

        mStatsManager.registerPullAtomCallback(

                tagId,

                metadata,

                (atomTag, data) -> pullMobileBytesTransfer(atomTag, data),

                Executors.newSingleThreadExecutor()

        );

    }



    private void pullMobileBytesTransfer() {

        // No op.

    private int pullMobileBytesTransfer(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;

            }

            // Combine all the metrics per Uid into one record.

            NetworkStats stats = networkStatsService.getDetailedUidStats(ifaces).groupedByUid();

            addNetworkStats(atomTag, pulledData, stats, false);

        } catch (RemoteException e) {

            Slog.e(TAG, "Pulling netstats for mobile bytes has error", e);

            return StatsManager.PULL_SKIP;

        } finally {

            Binder.restoreCallingIdentity(token);

        }

        return StatsManager.PULL_SUCCESS;

    }



    private void registerMobileBytesTransferBackground() {