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

Commit f4e17e66 authored by Tej Singh's avatar Tej Singh
Browse files

LibstatsPullTest, Testdrive updates for sandboxing 

Test: atest LibStatsPullTests
Test: statsd_testdrive 10051 10004 10055
Test: adb shell cmd stats pull-source 10051 AID_STATSD
Test: adb shell cmd stats pull-source 10055 AID_GPU_SERVICE
Test: adb shell cmd stats pull-source 10004
Bug: 151642352
Change-Id: I3b104cb2f2427b4558d5175dfeb3bb2c80012d0e
parent 3be093b5

apex/statsd/tests/libstatspull/src/com/android/internal/os/statsd/libstats/LibStatsPullTests.java

+4 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import androidx.test.runner.AndroidJUnit4; 
import com.android.internal.os.StatsdConfigProto.AtomMatcher;

import com.android.internal.os.StatsdConfigProto.FieldFilter;

import com.android.internal.os.StatsdConfigProto.GaugeMetric;

import com.android.internal.os.StatsdConfigProto.PullAtomPackages;

import com.android.internal.os.StatsdConfigProto.SimpleAtomMatcher;

import com.android.internal.os.StatsdConfigProto.StatsdConfig;

import com.android.internal.os.StatsdConfigProto.TimeUnit;
@@ -271,6 +272,9 @@ public class LibStatsPullTests { 
                        .setSamplingType(GaugeMetric.SamplingType.FIRST_N_SAMPLES)

                        .setMaxNumGaugeAtomsPerBucket(1000)

                )

                .addPullAtomPackages(PullAtomPackages.newBuilder()

                        .setAtomId(PULL_ATOM_TAG)

                        .addPackages(LibStatsPullTests.class.getPackage().getName()))

                .build();

        statsManager.addConfig(sConfigId, config.toByteArray());

        assertThat(StatsConfigUtils.verifyValidConfigExists(statsManager, sConfigId)).isTrue();

cmds/statsd/tools/localtools/src/com/android/statsd/shelltools/testdrive/TestDrive.java

+28 −13
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import com.android.internal.os.StatsdConfigProto.AtomMatcher; 
import com.android.internal.os.StatsdConfigProto.EventMetric;

import com.android.internal.os.StatsdConfigProto.FieldFilter;

import com.android.internal.os.StatsdConfigProto.GaugeMetric;

import com.android.internal.os.StatsdConfigProto.PullAtomPackages;

import com.android.internal.os.StatsdConfigProto.SimpleAtomMatcher;

import com.android.internal.os.StatsdConfigProto.StatsdConfig;

import com.android.internal.os.StatsdConfigProto.TimeUnit;
@@ -33,6 +34,7 @@ import com.google.common.io.Files; 
import java.io.File;

import java.io.IOException;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collections;

import java.util.HashSet;

import java.util.Set;
@@ -63,6 +65,9 @@ public class TestDrive { 
            "AID_MEDIA",

            "AID_NETWORK_STACK"

    };

    private static final String[] DEFAULT_PULL_SOURCES = {

            "AID_SYSTEM",

    };

    private static final Logger LOGGER = Logger.getLogger(TestDrive.class.getName());



    private String mAdditionalAllowedPackage;
@@ -158,6 +163,16 @@ public class TestDrive { 
        StatsdConfig.Builder builder = StatsdConfig.newBuilder();

        builder

            .addAllAllowedLogSource(allowedSources)

            .addAllDefaultPullPackages(Arrays.asList(DEFAULT_PULL_SOURCES))

            .addPullAtomPackages(PullAtomPackages.newBuilder()

                    .setAtomId(Atom.GPU_STATS_GLOBAL_INFO_FIELD_NUMBER)

                    .addPackages("AID_GPU_SERVICE"))

            .addPullAtomPackages(PullAtomPackages.newBuilder()

                    .setAtomId(Atom.GPU_STATS_APP_INFO_FIELD_NUMBER)

                    .addPackages("AID_GPU_SERVICE"))

            .addPullAtomPackages(PullAtomPackages.newBuilder()

                    .setAtomId(Atom.TRAIN_INFO_FIELD_NUMBER)

                    .addPackages("AID_STATSD"))

            .setHashStringsInMetricReport(false);



        if (hasPulledAtom(atomIds)) {