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

Commit a0f3fd99 authored by Marcin Oczeretko's avatar Marcin Oczeretko
Browse files

Set CujType int values correctly 

Test: run InteractionJankMonitorTest
Change-Id: Ibd5a2580dfd43b7ccfec90724eee73f575824e0a
Bug: 167170986
parent bf6a4487

core/java/com/android/internal/jank/InteractionJankMonitor.java

+25 −14
Original line number Diff line number Diff line
@@ -44,26 +44,37 @@ public class InteractionJankMonitor { 
    private static final long DEFAULT_TIMEOUT_MS = TimeUnit.SECONDS.toMillis(5L);



    // Every value must have a corresponding entry in CUJ_STATSD_INTERACTION_TYPE.

    public static final int CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE = 1;

    public static final int CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE_LOCK = 0;

    public static final int CUJ_NOTIFICATION_SHADE_SCROLL_FLING = 0;

    public static final int CUJ_NOTIFICATION_SHADE_ROW_EXPAND = 0;

    public static final int CUJ_NOTIFICATION_SHADE_ROW_SWIPE = 0;

    public static final int CUJ_NOTIFICATION_SHADE_QS_EXPAND_COLLAPSE = 0;

    public static final int CUJ_NOTIFICATION_SHADE_QS_SCROLL_SWIPE = 0;

    public static final int CUJ_LAUNCHER_APP_LAUNCH_FROM_RECENTS = 0;

    public static final int CUJ_LAUNCHER_APP_LAUNCH_FROM_ICON = 0;

    public static final int CUJ_LAUNCHER_APP_CLOSE_TO_HOME = 0;

    public static final int CUJ_LAUNCHER_APP_CLOSE_TO_PIP = 0;

    public static final int CUJ_LAUNCHER_QUICK_SWITCH = 0;

    public static final int CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE = 0;

    public static final int CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE_LOCK = 1;

    public static final int CUJ_NOTIFICATION_SHADE_SCROLL_FLING = 2;

    public static final int CUJ_NOTIFICATION_SHADE_ROW_EXPAND = 3;

    public static final int CUJ_NOTIFICATION_SHADE_ROW_SWIPE = 4;

    public static final int CUJ_NOTIFICATION_SHADE_QS_EXPAND_COLLAPSE = 5;

    public static final int CUJ_NOTIFICATION_SHADE_QS_SCROLL_SWIPE = 6;

    public static final int CUJ_LAUNCHER_APP_LAUNCH_FROM_RECENTS = 7;

    public static final int CUJ_LAUNCHER_APP_LAUNCH_FROM_ICON = 8;

    public static final int CUJ_LAUNCHER_APP_CLOSE_TO_HOME = 9;

    public static final int CUJ_LAUNCHER_APP_CLOSE_TO_PIP = 10;

    public static final int CUJ_LAUNCHER_QUICK_SWITCH = 11;



    private static final int NO_STATSD_LOGGING = -1;



    // Used to convert CujType to InteractionType enum value for statsd logging.

    // Use NO_STATSD_LOGGING in case the measurement for a given CUJ should not be logged to statsd.

    private static final int[] CUJ_TO_STATSD_INTERACTION_TYPE = {

            NO_STATSD_LOGGING,

    @VisibleForTesting

    public static final int[] CUJ_TO_STATSD_INTERACTION_TYPE = {

            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__NOTIFICATION_SHADE_SWIPE,

            NO_STATSD_LOGGING,

            NO_STATSD_LOGGING,

            NO_STATSD_LOGGING,

            NO_STATSD_LOGGING,

            NO_STATSD_LOGGING,

            NO_STATSD_LOGGING,

            NO_STATSD_LOGGING,

            NO_STATSD_LOGGING,

            NO_STATSD_LOGGING,

            NO_STATSD_LOGGING,

            NO_STATSD_LOGGING,

    };



    private static volatile InteractionJankMonitor sInstance;

core/tests/coretests/src/com/android/internal/jank/InteractionJankMonitorTest.java

+32 −0
Original line number Diff line number Diff line
@@ -17,8 +17,10 @@ 
package com.android.internal.jank;



import static com.android.internal.jank.InteractionJankMonitor.CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE;

import static com.android.internal.jank.InteractionJankMonitor.CUJ_TO_STATSD_INTERACTION_TYPE;



import static com.google.common.truth.Truth.assertThat;

import static com.google.common.truth.Truth.assertWithMessage;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyLong;
@@ -45,6 +47,13 @@ import org.junit.Rule; 
import org.junit.Test;

import org.mockito.ArgumentCaptor;



import java.lang.reflect.Field;

import java.lang.reflect.Modifier;

import java.util.Arrays;

import java.util.HashSet;

import java.util.List;

import java.util.stream.Collectors;



@SmallTest

public class InteractionJankMonitorTest {

    private ViewAttachTestActivity mActivity;
@@ -138,4 +147,27 @@ public class InteractionJankMonitorTest { 
        verify(tracker).cancel();

    }



    @Test

    public void testCujTypeEnumCorrectlyDefined() throws Exception {

        List<Field> cujEnumFields =

                Arrays.stream(InteractionJankMonitor.class.getDeclaredFields())

                        .filter(field -> field.getName().startsWith("CUJ_")

                                && Modifier.isStatic(field.getModifiers())

                                && field.getType() == int.class)

                        .collect(Collectors.toList());



        HashSet<Integer> allValues = new HashSet<>();

        for (Field field : cujEnumFields) {

            int fieldValue = field.getInt(null);

            assertWithMessage(

                    "Field %s must have a mapping to a value in CUJ_TO_STATSD_INTERACTION_TYPE",

                    field.getName())

                    .that(fieldValue < CUJ_TO_STATSD_INTERACTION_TYPE.length)

                    .isTrue();

            assertWithMessage("All CujType values must be unique. Field %s repeats existing value.",

                    field.getName())

                    .that(allValues.add(fieldValue))

                    .isTrue();

        }

    }

}