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

Commit 2f6f33fa authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Null pointer check for Bluetooth traffic" into pi-dev

parents 3b826c60 9e59f93a

cmds/statsd/src/external/StatsPuller.cpp

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ bool StatsPuller::Pull(const int64_t elapsedTimeNs, std::vector<std::shared_ptr< 
        data->setElapsedTimestampNs(elapsedTimeNs);

        data->setLogdWallClockTimestampNs(wallClockTimeNs);

    }

    if (ret) {

    if (ret && mCachedData.size() > 0) {

      mergeIsolatedUidsToHostUid(mCachedData, mUidMap, mTagId);

      (*data) = mCachedData;

    }

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

+8 −6
Original line number Diff line number Diff line
@@ -673,6 +673,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { 
    private void pullBluetoothBytesTransfer(int tagId, List<StatsLogEventWrapper> pulledData) {

        BluetoothActivityEnergyInfo info = pullBluetoothData();

        long elapsedNanos = SystemClock.elapsedRealtimeNanos();

        if (info.getUidTraffic() != null) {

            for (UidTraffic traffic : info.getUidTraffic()) {

                StatsLogEventWrapper e = new StatsLogEventWrapper(elapsedNanos, tagId, 3);

                e.writeInt(traffic.getUid());
@@ -681,6 +682,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { 
                pulledData.add(e);

            }

        }

    }



    private void pullMobileBytesTransferByFgBg(int tagId, List<StatsLogEventWrapper> pulledData) {

        long token = Binder.clearCallingIdentity();