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

Commit 5b9e8e93 authored by qingqi's avatar qingqi Committed by Qingqi Lei
Browse files

Decrease Service State metric cooldown time to 5 hours 

Test: m, inspected metrics log and basic functionality tests
Bug: 318901076

Change-Id: I9dcebadf90635e24d2cd7827c0007ccf041690fa
parent 7c3b3c71

src/java/com/android/internal/telephony/metrics/MetricsCollector.java

+16 −13
Original line number Diff line number Diff line
@@ -138,14 +138,6 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback { 
    private static final long MIN_COOLDOWN_MILLIS =

            DBG ? 10L * MILLIS_PER_SECOND : 23L * MILLIS_PER_HOUR;



    /**

     * Sets atom pull cool down to 4 minutes for userdebug build.

     *

     * <p>Applies to certain atoms: CellularServiceState.

     */

    private static final long CELL_SERVICE_MIN_COOLDOWN_MILLIS =

            DBG ? 10L * MILLIS_PER_SECOND :

                    IS_DEBUGGABLE ? 4L * MILLIS_PER_MINUTE : 23L * MILLIS_PER_HOUR;



    /**

     * Buckets with less than these many calls will be dropped.
@@ -166,6 +158,13 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback { 
    private static final long CELL_SERVICE_DURATION_BUCKET_MILLIS =

            DBG || IS_DEBUGGABLE ? 2L * MILLIS_PER_SECOND : 5L * MILLIS_PER_MINUTE;



    /**

     * Sets atom pull cool down to 4 minutes for userdebug build, 5 hours for user build.

     *

     * <p>Applies to certain atoms: CellularServiceState, DataCallSession,

     * ImsRegistrationTermination.

     */

    private final long mPowerCorrelatedMinCooldownMillis;

    private final PersistAtomsStorage mStorage;

    private final DeviceStateHelper mDeviceStateHelper;

    private final StatsManager mStatsManager;
@@ -234,6 +233,9 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback { 


        mAirplaneModeStats = new AirplaneModeStats(context);

        mDefaultNetworkMonitor = new DefaultNetworkMonitor(context, featureFlags);

        mPowerCorrelatedMinCooldownMillis = DBG ? 10L * MILLIS_PER_SECOND :

                IS_DEBUGGABLE ? 4L * MILLIS_PER_MINUTE : (long) context.getResources().getInteger(

                com.android.internal.R.integer.config_metrics_pull_cooldown_millis);

    }



    /**
@@ -516,7 +518,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback { 
    private int pullDataCallSession(List<StatsEvent> data) {

        // Include ongoing data call segments

        concludeDataCallSessionStats();

        DataCallSession[] dataCallSessions = mStorage.getDataCallSessions(MIN_COOLDOWN_MILLIS);

        DataCallSession[] dataCallSessions = mStorage.getDataCallSessions(

                mPowerCorrelatedMinCooldownMillis);

        if (dataCallSessions != null) {

            Arrays.stream(dataCallSessions)

                    .forEach(dataCall -> data.add(buildStatsEvent(dataCall)));
@@ -544,8 +547,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback { 
    private int pullCellularServiceState(List<StatsEvent> data) {

        // Include the latest durations

        concludeServiceStateStats();

        CellularServiceState[] persistAtoms =

                mStorage.getCellularServiceStates(CELL_SERVICE_MIN_COOLDOWN_MILLIS);

        CellularServiceState[] persistAtoms = mStorage.getCellularServiceStates(

                mPowerCorrelatedMinCooldownMillis);

        if (persistAtoms != null) {

            // list is already shuffled when instances were inserted

            Arrays.stream(persistAtoms)
@@ -573,8 +576,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback { 
    }



    private int pullImsRegistrationTermination(List<StatsEvent> data) {

        ImsRegistrationTermination[] persistAtoms =

                mStorage.getImsRegistrationTerminations(MIN_COOLDOWN_MILLIS);

        ImsRegistrationTermination[] persistAtoms = mStorage.getImsRegistrationTerminations(

                mPowerCorrelatedMinCooldownMillis);

        if (persistAtoms != null) {

            // list is already shuffled when instances were inserted

            Arrays.stream(persistAtoms)

tests/telephonytests/src/com/android/internal/telephony/metrics/MetricsCollectorTest.java

+6 −3
Original line number Diff line number Diff line
@@ -70,8 +70,8 @@ public class MetricsCollectorTest extends TelephonyTest { 
                    .setCoolDownMillis(24L * 3600L * 1000L)

                    .build();

    private static final long MIN_COOLDOWN_MILLIS = 23L * 3600L * 1000L;

    private static final long CELL_SERVICE_MIN_COOLDOWN_MILLIS =

            IS_DEBUGGABLE ? 4L *  60L * 1000L : MIN_COOLDOWN_MILLIS;

    private static final long POWER_CORRELATED_MIN_COOLDOWN_MILLIS =

            IS_DEBUGGABLE ? 4L *  60L * 1000L : 5L * 3600L * 1000L;

    private static final long MIN_CALLS_PER_BUCKET = 5L;



    // NOTE: these fields are currently 32-bit internally and padded to 64-bit by TelephonyManager
@@ -402,6 +402,9 @@ public class MetricsCollectorTest extends TelephonyTest { 
    @SmallTest

    public void onPullAtom_cellularServiceState_tooFrequent() throws Exception {

        doReturn(null).when(mPersistAtomsStorage).getCellularServiceStates(anyLong());

        mContextFixture.putIntResource(

                com.android.internal.R.integer.config_metrics_pull_cooldown_millis,

                (int) POWER_CORRELATED_MIN_COOLDOWN_MILLIS);

        List<StatsEvent> actualAtoms = new ArrayList<>();



        int result = mMetricsCollector.onPullAtom(CELLULAR_SERVICE_STATE, actualAtoms);
@@ -409,7 +412,7 @@ public class MetricsCollectorTest extends TelephonyTest { 
        assertThat(actualAtoms).hasSize(0);

        assertThat(result).isEqualTo(StatsManager.PULL_SKIP);

        verify(mPersistAtomsStorage, times(1)).getCellularServiceStates(

                eq(CELL_SERVICE_MIN_COOLDOWN_MILLIS));

                eq(POWER_CORRELATED_MIN_COOLDOWN_MILLIS));

        verifyNoMoreInteractions(mPersistAtomsStorage);

    }