Merge "Renames ChooserActivityLogger => logging/EventLog" into udc-qpr-dev

7 files changed, 58 insertions, 52 deletions

diff --git a/java/tests/src/com/android/intentresolver/ChooserActionFactoryTest.kt b/java/tests/src/com/android/intentresolver/ChooserActionFactoryTest.kt
index 8d994f08..af6e5f16 100644
--- a/java/tests/src/com/android/intentresolver/ChooserActionFactoryTest.kt
+++ b/java/tests/src/com/android/intentresolver/ChooserActionFactoryTest.kt
@@ -27,6 +27,7 @@ import android.graphics.drawable.Icon
 import android.service.chooser.ChooserAction
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
+import com.android.intentresolver.logging.EventLog
 import com.google.common.collect.ImmutableList
 import com.google.common.truth.Truth.assertThat
 import java.util.concurrent.CountDownLatch
@@ -43,7 +44,7 @@ import org.mockito.Mockito
 class ChooserActionFactoryTest {
     private val context = InstrumentationRegistry.getInstrumentation().getContext()
 
-    private val logger = mock<ChooserActivityLogger>()
+    private val logger = mock<EventLog>()
     private val actionLabel = "Action label"
     private val modifyShareLabel = "Modify share"
     private val testAction = "com.android.intentresolver.testaction"
@@ -107,7 +108,7 @@ class ChooserActionFactoryTest {
         action.onClicked.run()
 
         Mockito.verify(logger)
-            .logActionSelected(eq(ChooserActivityLogger.SELECTION_TYPE_MODIFY_SHARE))
+            .logActionSelected(eq(EventLog.SELECTION_TYPE_MODIFY_SHARE))
         assertEquals(Activity.RESULT_OK, resultConsumer.latestReturn)
         // Verify the pending intent has been called
         countdown.await(500, TimeUnit.MILLISECONDS)
diff --git a/java/tests/src/com/android/intentresolver/ChooserActivityOverrideData.java b/java/tests/src/com/android/intentresolver/ChooserActivityOverrideData.java
index ce96ef63..84f5124c 100644
--- a/java/tests/src/com/android/intentresolver/ChooserActivityOverrideData.java
+++ b/java/tests/src/com/android/intentresolver/ChooserActivityOverrideData.java
@@ -30,6 +30,7 @@ import com.android.intentresolver.AbstractMultiProfilePagerAdapter.CrossProfileI
 import com.android.intentresolver.chooser.TargetInfo;
 import com.android.intentresolver.contentpreview.ImageLoader;
 import com.android.intentresolver.flags.FeatureFlagRepository;
+import com.android.intentresolver.logging.EventLog;
 import com.android.intentresolver.shortcuts.ShortcutLoader;
 
 import java.util.function.Consumer;
@@ -64,7 +65,7 @@ public class ChooserActivityOverrideData {
     public Cursor resolverCursor;
     public boolean resolverForceException;
     public ImageLoader imageLoader;
-    public ChooserActivityLogger chooserActivityLogger;
+    public EventLog mEventLog;
     public int alternateProfileSetting;
     public Resources resources;
     public UserHandle workProfileUserHandle;
@@ -87,7 +88,7 @@ public class ChooserActivityOverrideData {
         resolverForceException = false;
         resolverListController = mock(ChooserActivity.ChooserListController.class);
         workResolverListController = mock(ChooserActivity.ChooserListController.class);
-        chooserActivityLogger = mock(ChooserActivityLogger.class);
+        mEventLog = mock(EventLog.class);
         alternateProfileSetting = 0;
         resources = null;
         workProfileUserHandle = null;
diff --git a/java/tests/src/com/android/intentresolver/ChooserListAdapterTest.kt b/java/tests/src/com/android/intentresolver/ChooserListAdapterTest.kt
index 4612b430..c8cb4b9b 100644
--- a/java/tests/src/com/android/intentresolver/ChooserListAdapterTest.kt
+++ b/java/tests/src/com/android/intentresolver/ChooserListAdapterTest.kt
@@ -31,6 +31,7 @@ import com.android.intentresolver.chooser.DisplayResolveInfo
 import com.android.intentresolver.chooser.SelectableTargetInfo
 import com.android.intentresolver.chooser.TargetInfo
 import com.android.intentresolver.icons.TargetDataLoader
+import com.android.intentresolver.logging.EventLog
 import com.android.internal.R
 import org.junit.Before
 import org.junit.Test
@@ -49,7 +50,7 @@ class ChooserListAdapterTest {
         }
     private val context = InstrumentationRegistry.getInstrumentation().context
     private val resolverListController = mock<ResolverListController>()
-    private val chooserActivityLogger = mock<ChooserActivityLogger>()
+    private val mEventLog = mock<EventLog>()
     private val mTargetDataLoader = mock<TargetDataLoader>()
 
     private val testSubject by lazy {
@@ -64,7 +65,7 @@ class ChooserListAdapterTest {
             Intent(),
             mock(),
             packageManager,
-            chooserActivityLogger,
+            mEventLog,
             mock(),
             0,
             null,
diff --git a/java/tests/src/com/android/intentresolver/ChooserWrapperActivity.java b/java/tests/src/com/android/intentresolver/ChooserWrapperActivity.java
index 6ac6b6d3..8608cf72 100644
--- a/java/tests/src/com/android/intentresolver/ChooserWrapperActivity.java
+++ b/java/tests/src/com/android/intentresolver/ChooserWrapperActivity.java
@@ -40,6 +40,7 @@ import com.android.intentresolver.chooser.TargetInfo;
 import com.android.intentresolver.flags.FeatureFlagRepository;
 import com.android.intentresolver.grid.ChooserGridAdapter;
 import com.android.intentresolver.icons.TargetDataLoader;
+import com.android.intentresolver.logging.EventLog;
 import com.android.intentresolver.shortcuts.ShortcutLoader;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 
@@ -89,7 +90,7 @@ public class ChooserWrapperActivity
                 targetIntent,
                 this,
                 packageManager,
-                getChooserActivityLogger(),
+                getEventLog(),
                 chooserRequest,
                 maxTargetsPerRow,
                 userHandle,
@@ -205,8 +206,8 @@ public class ChooserWrapperActivity
     }
 
     @Override
-    public ChooserActivityLogger getChooserActivityLogger() {
-        return sOverrides.chooserActivityLogger;
+    public EventLog getEventLog() {
+        return sOverrides.mEventLog;
     }
 
     @Override
diff --git a/java/tests/src/com/android/intentresolver/IChooserWrapper.java b/java/tests/src/com/android/intentresolver/IChooserWrapper.java
index af897a47..3326d7f2 100644
--- a/java/tests/src/com/android/intentresolver/IChooserWrapper.java
+++ b/java/tests/src/com/android/intentresolver/IChooserWrapper.java
@@ -23,6 +23,7 @@ import android.content.pm.ResolveInfo;
 import android.os.UserHandle;
 
 import com.android.intentresolver.chooser.DisplayResolveInfo;
+import com.android.intentresolver.logging.EventLog;
 
 import java.util.concurrent.Executor;
 
@@ -41,6 +42,6 @@ public interface IChooserWrapper {
             CharSequence pLabel, CharSequence pInfo, Intent replacementIntent,
             @Nullable TargetPresentationGetter resolveInfoPresentationGetter);
     UserHandle getCurrentUserHandle();
-    ChooserActivityLogger getChooserActivityLogger();
+    EventLog getEventLog();
     Executor getMainExecutor();
 }
diff --git a/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java b/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java
index 8233f0db..ecd05b46 100644
--- a/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java
+++ b/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java
@@ -108,6 +108,7 @@ import androidx.test.rule.ActivityTestRule;
 
 import com.android.intentresolver.chooser.DisplayResolveInfo;
 import com.android.intentresolver.contentpreview.ImageLoader;
+import com.android.intentresolver.logging.EventLog;
 import com.android.intentresolver.shortcuts.ShortcutLoader;
 import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -900,8 +901,8 @@ public class UnbundledChooserActivityTest {
         onView(withId(R.id.copy)).check(matches(isDisplayed()));
         onView(withId(R.id.copy)).perform(click());
 
-        ChooserActivityLogger logger = activity.getChooserActivityLogger();
-        verify(logger, times(1)).logActionSelected(eq(ChooserActivityLogger.SELECTION_TYPE_COPY));
+        EventLog logger = activity.getEventLog();
+        verify(logger, times(1)).logActionSelected(eq(EventLog.SELECTION_TYPE_COPY));
     }
 
     @Test
@@ -1100,7 +1101,7 @@ public class UnbundledChooserActivityTest {
 
         final IChooserWrapper activity = (IChooserWrapper)
                 mActivityRule.launchActivity(Intent.createChooser(sendIntent, "logger test"));
-        ChooserActivityLogger logger = activity.getChooserActivityLogger();
+        EventLog logger = activity.getEventLog();
         waitForIdle();
 
         verify(logger).logChooserActivityShown(eq(false), eq(TEST_MIME_TYPE), anyLong());
@@ -1115,7 +1116,7 @@ public class UnbundledChooserActivityTest {
 
         final IChooserWrapper activity = (IChooserWrapper)
                 mActivityRule.launchActivity(Intent.createChooser(sendIntent, "logger test"));
-        ChooserActivityLogger logger = activity.getChooserActivityLogger();
+        EventLog logger = activity.getEventLog();
         waitForIdle();
 
         verify(logger).logChooserActivityShown(eq(true), eq(TEST_MIME_TYPE), anyLong());
@@ -1128,7 +1129,7 @@ public class UnbundledChooserActivityTest {
         final IChooserWrapper activity = (IChooserWrapper)
                 mActivityRule.launchActivity(
                         Intent.createChooser(sendIntent, "empty preview logger test"));
-        ChooserActivityLogger logger = activity.getChooserActivityLogger();
+        EventLog logger = activity.getEventLog();
         waitForIdle();
 
         verify(logger).logChooserActivityShown(eq(false), eq(null), anyLong());
@@ -1147,7 +1148,7 @@ public class UnbundledChooserActivityTest {
         waitForIdle();
 
         // Second invocation is from onCreate
-        ChooserActivityLogger logger = activity.getChooserActivityLogger();
+        EventLog logger = activity.getEventLog();
         Mockito.verify(logger, times(1)).logActionShareWithPreview(eq(CONTENT_PREVIEW_TEXT));
     }
 
@@ -1169,7 +1170,7 @@ public class UnbundledChooserActivityTest {
         final IChooserWrapper activity = (IChooserWrapper)
                 mActivityRule.launchActivity(Intent.createChooser(sendIntent, null));
         waitForIdle();
-        ChooserActivityLogger logger = activity.getChooserActivityLogger();
+        EventLog logger = activity.getEventLog();
         Mockito.verify(logger, times(1)).logActionShareWithPreview(eq(CONTENT_PREVIEW_IMAGE));
     }
 
@@ -1371,8 +1372,8 @@ public class UnbundledChooserActivityTest {
 
         ArgumentCaptor<HashedStringCache.HashResult> hashCaptor =
                 ArgumentCaptor.forClass(HashedStringCache.HashResult.class);
-        verify(activity.getChooserActivityLogger(), times(1)).logShareTargetSelected(
-                eq(ChooserActivityLogger.SELECTION_TYPE_SERVICE),
+        verify(activity.getEventLog(), times(1)).logShareTargetSelected(
+                eq(EventLog.SELECTION_TYPE_SERVICE),
                 /* packageName= */ any(),
                 /* positionPicked= */ anyInt(),
                 /* directTargetAlsoRanked= */ eq(-1),
@@ -1452,8 +1453,8 @@ public class UnbundledChooserActivityTest {
                 .perform(click());
         waitForIdle();
 
-        verify(activity.getChooserActivityLogger(), times(1)).logShareTargetSelected(
-                eq(ChooserActivityLogger.SELECTION_TYPE_SERVICE),
+        verify(activity.getEventLog(), times(1)).logShareTargetSelected(
+                eq(EventLog.SELECTION_TYPE_SERVICE),
                 /* packageName= */ any(),
                 /* positionPicked= */ anyInt(),
                 /* directTargetAlsoRanked= */ eq(0),
@@ -1862,9 +1863,9 @@ public class UnbundledChooserActivityTest {
                 .perform(click());
         waitForIdle();
 
-        ChooserActivityLogger logger = wrapper.getChooserActivityLogger();
+        EventLog logger = wrapper.getEventLog();
         verify(logger, times(1)).logShareTargetSelected(
-                eq(ChooserActivityLogger.SELECTION_TYPE_SERVICE),
+                eq(EventLog.SELECTION_TYPE_SERVICE),
                 /* packageName= */ any(),
                 /* positionPicked= */ anyInt(),
                 // The packages sholdn't match for app target and direct target:
@@ -2194,10 +2195,10 @@ public class UnbundledChooserActivityTest {
                 .perform(click());
         waitForIdle();
 
-        ChooserActivityLogger logger = activity.getChooserActivityLogger();
+        EventLog logger = activity.getEventLog();
         ArgumentCaptor<Integer> typeCaptor = ArgumentCaptor.forClass(Integer.class);
         verify(logger, times(1)).logShareTargetSelected(
-                eq(ChooserActivityLogger.SELECTION_TYPE_SERVICE),
+                eq(EventLog.SELECTION_TYPE_SERVICE),
                 /* packageName= */ any(),
                 /* positionPicked= */ anyInt(),
                 /* directTargetAlsoRanked= */ anyInt(),
diff --git a/java/tests/src/com/android/intentresolver/ChooserActivityLoggerTest.java b/java/tests/src/com/android/intentresolver/logging/EventLogTest.java
index aa42c24c..17452774 100644
--- a/java/tests/src/com/android/intentresolver/ChooserActivityLoggerTest.java
+++ b/java/tests/src/com/android/intentresolver/logging/EventLogTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 The Android Open Source Project
+ * Copyright (C) 2023 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.intentresolver;
+package com.android.intentresolver.logging;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -32,10 +32,10 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
 import android.content.Intent;
 import android.metrics.LogMaker;
 
-import com.android.intentresolver.ChooserActivityLogger.FrameworkStatsLogger;
-import com.android.intentresolver.ChooserActivityLogger.SharesheetStandardEvent;
-import com.android.intentresolver.ChooserActivityLogger.SharesheetStartedEvent;
-import com.android.intentresolver.ChooserActivityLogger.SharesheetTargetSelectedEvent;
+import com.android.intentresolver.logging.EventLog.FrameworkStatsLogger;
+import com.android.intentresolver.logging.EventLog.SharesheetStandardEvent;
+import com.android.intentresolver.logging.EventLog.SharesheetStartedEvent;
+import com.android.intentresolver.logging.EventLog.SharesheetTargetSelectedEvent;
 import com.android.intentresolver.contentpreview.ContentPreviewType;
 import com.android.internal.logging.InstanceId;
 import com.android.internal.logging.MetricsLogger;
@@ -53,17 +53,17 @@ import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
-public final class ChooserActivityLoggerTest {
+public final class EventLogTest {
     @Mock private UiEventLogger mUiEventLog;
     @Mock private FrameworkStatsLogger mFrameworkLog;
     @Mock private MetricsLogger mMetricsLogger;
 
-    private ChooserActivityLogger mChooserLogger;
+    private EventLog mChooserLogger;
 
     @Before
     public void setUp() {
         //Mockito.reset(mUiEventLog, mFrameworkLog, mMetricsLogger);
-        mChooserLogger = new ChooserActivityLogger(mUiEventLog, mFrameworkLog, mMetricsLogger);
+        mChooserLogger = new EventLog(mUiEventLog, mFrameworkLog, mMetricsLogger);
     }
 
     @After
@@ -151,7 +151,7 @@ public final class ChooserActivityLoggerTest {
 
     @Test
     public void testLogShareTargetSelected() {
-        final int targetType = ChooserActivityLogger.SELECTION_TYPE_SERVICE;
+        final int targetType = EventLog.SELECTION_TYPE_SERVICE;
         final String packageName = "com.test.foo";
         final int positionPicked = 123;
         final int directTargetAlsoRanked = -1;
@@ -189,7 +189,7 @@ public final class ChooserActivityLoggerTest {
 
     @Test
     public void testLogActionSelected() {
-        mChooserLogger.logActionSelected(ChooserActivityLogger.SELECTION_TYPE_COPY);
+        mChooserLogger.logActionSelected(EventLog.SELECTION_TYPE_COPY);
 
         verify(mFrameworkLog).write(
                 eq(FrameworkStatsLog.RANKING_SELECTED),
@@ -320,10 +320,10 @@ public final class ChooserActivityLoggerTest {
     @Test
     public void testDifferentLoggerInstancesUseDifferentInstanceIds() {
         ArgumentCaptor<Integer> idIntCaptor = ArgumentCaptor.forClass(Integer.class);
-        ChooserActivityLogger chooserLogger2 =
-                new ChooserActivityLogger(mUiEventLog, mFrameworkLog, mMetricsLogger);
+        EventLog chooserLogger2 =
+                new EventLog(mUiEventLog, mFrameworkLog, mMetricsLogger);
 
-        final int targetType = ChooserActivityLogger.SELECTION_TYPE_COPY;
+        final int targetType = EventLog.SELECTION_TYPE_COPY;
         final String packageName = "com.test.foo";
         final int positionPicked = 123;
         final int directTargetAlsoRanked = -1;
@@ -370,7 +370,7 @@ public final class ChooserActivityLoggerTest {
         ArgumentCaptor<Integer> idIntCaptor = ArgumentCaptor.forClass(Integer.class);
         ArgumentCaptor<InstanceId> idObjectCaptor = ArgumentCaptor.forClass(InstanceId.class);
 
-        final int targetType = ChooserActivityLogger.SELECTION_TYPE_COPY;
+        final int targetType = EventLog.SELECTION_TYPE_COPY;
         final String packageName = "com.test.foo";
         final int positionPicked = 123;
         final int directTargetAlsoRanked = -1;
@@ -403,20 +403,20 @@ public final class ChooserActivityLoggerTest {
 
     @Test
     public void testTargetSelectionCategories() {
-        assertThat(ChooserActivityLogger.getTargetSelectionCategory(
-                ChooserActivityLogger.SELECTION_TYPE_SERVICE))
+        assertThat(EventLog.getTargetSelectionCategory(
+                EventLog.SELECTION_TYPE_SERVICE))
                         .isEqualTo(MetricsEvent.ACTION_ACTIVITY_CHOOSER_PICKED_SERVICE_TARGET);
-        assertThat(ChooserActivityLogger.getTargetSelectionCategory(
-                ChooserActivityLogger.SELECTION_TYPE_APP))
+        assertThat(EventLog.getTargetSelectionCategory(
+                EventLog.SELECTION_TYPE_APP))
                         .isEqualTo(MetricsEvent.ACTION_ACTIVITY_CHOOSER_PICKED_APP_TARGET);
-        assertThat(ChooserActivityLogger.getTargetSelectionCategory(
-                ChooserActivityLogger.SELECTION_TYPE_STANDARD))
+        assertThat(EventLog.getTargetSelectionCategory(
+                EventLog.SELECTION_TYPE_STANDARD))
                         .isEqualTo(MetricsEvent.ACTION_ACTIVITY_CHOOSER_PICKED_STANDARD_TARGET);
-        assertThat(ChooserActivityLogger.getTargetSelectionCategory(
-                ChooserActivityLogger.SELECTION_TYPE_COPY)).isEqualTo(0);
-        assertThat(ChooserActivityLogger.getTargetSelectionCategory(
-                ChooserActivityLogger.SELECTION_TYPE_NEARBY)).isEqualTo(0);
-        assertThat(ChooserActivityLogger.getTargetSelectionCategory(
-                ChooserActivityLogger.SELECTION_TYPE_EDIT)).isEqualTo(0);
+        assertThat(EventLog.getTargetSelectionCategory(
+                EventLog.SELECTION_TYPE_COPY)).isEqualTo(0);
+        assertThat(EventLog.getTargetSelectionCategory(
+                EventLog.SELECTION_TYPE_NEARBY)).isEqualTo(0);
+        assertThat(EventLog.getTargetSelectionCategory(
+                EventLog.SELECTION_TYPE_EDIT)).isEqualTo(0);
     }
 }