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

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

Cleanup StatsPullAtomService 

Move all variable declarations to top of file
Delete unused puller registrations
Migrate to new API

Test: m -j
Bug: 145565211
Change-Id: I03890e333dd179be3b8d075657cf84a2247a473c
parent 0202be5d

apex/statsd/framework/java/android/app/StatsManager.java

+0 −20
Original line number Diff line number Diff line
@@ -473,17 +473,6 @@ public final class StatsManager { 
        }

    }



    /**

     * Temp registration for while the migration is in progress.

     *

     * @hide

     */

    public void registerPullAtomCallback(int atomTag, @Nullable PullAtomMetadata metadata,

            @NonNull StatsPullAtomCallback callback,

            @NonNull @CallbackExecutor Executor executor) {

        registerPullAtomCallback(atomTag, metadata, executor, callback);

    }



    /**

     * Registers a callback for an atom when that atom is to be pulled. The stats service will

     * invoke pullData in the callback when the stats service determines that this atom needs to be
@@ -590,15 +579,6 @@ public final class StatsManager { 
            mAdditiveFields = additiveFields;

        }



        /**

         * Temp for while migrations are in progress.

         *

         * @hide

         */

        public static PullAtomMetadata.Builder newBuilder() {

            return new PullAtomMetadata.Builder();

        }



        /**

         *  Builder for PullAtomMetadata.

         */

core/tests/coretests/src/android/app/PullAtomMetadataTest.java

+5 −5
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ public final class PullAtomMetadataTest { 


    @Test

    public void testEmpty() {

        PullAtomMetadata metadata = PullAtomMetadata.newBuilder().build();

        PullAtomMetadata metadata = new PullAtomMetadata.Builder().build();

        assertThat(metadata.getTimeoutNs()).isEqualTo(StatsManager.DEFAULT_TIMEOUT_NS);

        assertThat(metadata.getCoolDownNs()).isEqualTo(StatsManager.DEFAULT_COOL_DOWN_NS);

        assertThat(metadata.getAdditiveFields()).isNull();
@@ -42,7 +42,7 @@ public final class PullAtomMetadataTest { 
    public void testSetTimeoutNs() {

        long timeoutNs = 500_000_000L;

        PullAtomMetadata metadata =

                PullAtomMetadata.newBuilder().setTimeoutNs(timeoutNs).build();

                new PullAtomMetadata.Builder().setTimeoutNs(timeoutNs).build();

        assertThat(metadata.getTimeoutNs()).isEqualTo(timeoutNs);

        assertThat(metadata.getCoolDownNs()).isEqualTo(StatsManager.DEFAULT_COOL_DOWN_NS);

        assertThat(metadata.getAdditiveFields()).isNull();
@@ -52,7 +52,7 @@ public final class PullAtomMetadataTest { 
    public void testSetCoolDownNs() {

        long coolDownNs = 10_000_000_000L;

        PullAtomMetadata metadata =

                PullAtomMetadata.newBuilder().setCoolDownNs(coolDownNs).build();

                new PullAtomMetadata.Builder().setCoolDownNs(coolDownNs).build();

        assertThat(metadata.getTimeoutNs()).isEqualTo(StatsManager.DEFAULT_TIMEOUT_NS);

        assertThat(metadata.getCoolDownNs()).isEqualTo(coolDownNs);

        assertThat(metadata.getAdditiveFields()).isNull();
@@ -62,7 +62,7 @@ public final class PullAtomMetadataTest { 
    public void testSetAdditiveFields() {

        int[] fields = {2, 4, 6};

        PullAtomMetadata metadata =

                PullAtomMetadata.newBuilder().setAdditiveFields(fields).build();

                new PullAtomMetadata.Builder().setAdditiveFields(fields).build();

        assertThat(metadata.getTimeoutNs()).isEqualTo(StatsManager.DEFAULT_TIMEOUT_NS);

        assertThat(metadata.getCoolDownNs()).isEqualTo(StatsManager.DEFAULT_COOL_DOWN_NS);

        assertThat(metadata.getAdditiveFields()).isEqualTo(fields);
@@ -73,7 +73,7 @@ public final class PullAtomMetadataTest { 
        long timeoutNs = 300L;

        long coolDownNs = 9572L;

        int[] fields = {3, 2};

        PullAtomMetadata metadata = PullAtomMetadata.newBuilder()

        PullAtomMetadata metadata = new PullAtomMetadata.Builder()

                .setTimeoutNs(timeoutNs)

                .setCoolDownNs(coolDownNs)

                .setAdditiveFields(fields)

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

+176 −187

File changed.

Preview size limit exceeded, changes collapsed.