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

Commit 8d3ec4a6 authored by Ruchir Rastogi's avatar Ruchir Rastogi Committed by Android (Google) Code Review
Browse files

Merge "Migrate BuildInformation puller to new API"

parents ca73951a 425d8362

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

+0 −20
Original line number Diff line number Diff line
@@ -1404,21 +1404,6 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { 
        }

    }



    private void pullBuildInformation(int tagId,

            long elapsedNanos, long wallClockNanos, List<StatsLogEventWrapper> pulledData) {

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

        e.writeString(Build.FINGERPRINT);

        e.writeString(Build.BRAND);

        e.writeString(Build.PRODUCT);

        e.writeString(Build.DEVICE);

        e.writeString(Build.VERSION.RELEASE);

        e.writeString(Build.ID);

        e.writeString(Build.VERSION.INCREMENTAL);

        e.writeString(Build.TYPE);

        e.writeString(Build.TAGS);

        pulledData.add(e);

    }



    private BatteryStatsHelper getBatteryStatsHelper() {

        if (mBatteryStatsHelper == null) {

            final long callingToken = Binder.clearCallingIdentity();
@@ -2113,11 +2098,6 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { 
                break;

            }



            case StatsLog.BUILD_INFORMATION: {

                pullBuildInformation(tagId, elapsedNanos, wallClockNanos, ret);

                break;

            }



            case StatsLog.PROCESS_CPU_TIME: {

                pullProcessCpuTime(tagId, elapsedNanos, wallClockNanos, ret);

                break;

cmds/statsd/src/external/StatsPullerManager.cpp

+0 −4
Original line number Diff line number Diff line
@@ -217,10 +217,6 @@ std::map<PullerKey, PullAtomInfo> StatsPullerManager::kAllPullAtomInfo = { 
         {.additiveFields = {1, 2, 3, 4},

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



        // BuildInformation.

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

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



        // RoleHolder.

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

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

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

+22 −3
Original line number Diff line number Diff line
@@ -1154,11 +1154,30 @@ public class StatsPullAtomService extends SystemService { 
    }



    private void registerBuildInformation() {

        // No op.

        int tagId = StatsLog.BUILD_INFORMATION;

        mStatsManager.registerPullAtomCallback(

                tagId,

                null, // use default PullAtomMetadata values

                (atomTag, data) -> pullBuildInformation(atomTag, data),

                BackgroundThread.getExecutor()

        );

    }



    private void pullBuildInformation() {

        // No op.

    private int pullBuildInformation(int atomTag, List<StatsEvent> pulledData) {

        StatsEvent e = StatsEvent.newBuilder()

                .setAtomId(atomTag)

                .writeString(Build.FINGERPRINT)

                .writeString(Build.BRAND)

                .writeString(Build.PRODUCT)

                .writeString(Build.DEVICE)

                .writeString(Build.VERSION.RELEASE)

                .writeString(Build.ID)

                .writeString(Build.VERSION.INCREMENTAL)

                .writeString(Build.TYPE)

                .writeString(Build.TAGS)

                .build();

        pulledData.add(e);

        return StatsManager.PULL_SUCCESS;

    }



    private void registerRoleHolder() {