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

Commit bd2c4ba4 authored by Ruchir Rastogi's avatar Ruchir Rastogi Committed by Jeffrey Huang
Browse files

Migrate pullTimeZoneDataInfo to new API 

Test: adb shell cmd stats pull-source 10052
Bug: 145565211
Change-Id: Ifeedbb949fd01d82a9a9a0985a0a17cfbffb8558
parent 7a9ae133

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

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

    }



    private void pullTimeZoneDataInfo(int tagId,

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

        String tzDbVersion = "Unknown";

        try {

            tzDbVersion = android.icu.util.TimeZone.getTZDataVersion();

        } catch (Exception e) {

            Log.e(TAG, "Getting tzdb version failed: ", e);

        }



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

        e.writeString(tzDbVersion);

        pulledData.add(e);

    }



    private void pullExternalStorageInfo(int tagId, long elapsedNanos, long wallClockNanos,

            List<StatsLogEventWrapper> pulledData) {

        StorageManager storageManager = mContext.getSystemService(StorageManager.class);
@@ -1133,11 +1119,6 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { 
                break;

            }



            case StatsLog.TIME_ZONE_DATA_INFO: {

                pullTimeZoneDataInfo(tagId, elapsedNanos, wallClockNanos, ret);

                break;

            }



            case StatsLog.EXTERNAL_STORAGE_INFO: {

                pullExternalStorageInfo(tagId, elapsedNanos, wallClockNanos, ret);

                break;

cmds/statsd/src/external/StatsPullerManager.cpp

+0 −4
Original line number Diff line number Diff line
@@ -113,10 +113,6 @@ std::map<PullerKey, PullAtomInfo> StatsPullerManager::kAllPullAtomInfo = { 
        // TrainInfo.

        {{.atomTag = android::util::TRAIN_INFO}, {.puller = new TrainInfoPuller()}},



        // TimeZoneDataInfo.

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

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



        // ExternalStorageInfo

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

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

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

+23 −3
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ import java.util.HashSet; 
import java.util.List;

import java.util.Map;

import java.util.Map.Entry;

import java.util.MissingResourceException;

import java.util.Objects;

import java.util.Set;

import java.util.UUID;
@@ -2311,11 +2312,30 @@ public class StatsPullAtomService extends SystemService { 
    }



    private void registerTimeZoneDataInfo() {

        // No op.

        int tagId = StatsLog.TIME_ZONE_DATA_INFO;

        mStatsManager.registerPullAtomCallback(

                tagId,

                null, // use default PullAtomMetadata values

                (atomTag, data) -> pullTimeZoneDataInfo(atomTag, data),

                BackgroundThread.getExecutor()

        );

    }



    private void pullTimeZoneDataInfo() {

        // No op.

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

        String tzDbVersion = "Unknown";

        try {

            tzDbVersion = android.icu.util.TimeZone.getTZDataVersion();

        } catch (MissingResourceException e) {

            Slog.e(TAG, "Getting tzdb version failed: ", e);

            return StatsManager.PULL_SKIP;

        }



        StatsEvent e = StatsEvent.newBuilder()

                .setAtomId(atomTag)

                .writeString(tzDbVersion)

                .build();

        pulledData.add(e);

        return StatsManager.PULL_SUCCESS;

    }



    private void registerExternalStorageInfo() {