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

14 files changed, 120 insertions, 110 deletions

diff --git a/java/src/com/android/intentresolver/ChooserActionFactory.java b/java/src/com/android/intentresolver/ChooserActionFactory.java
index 06c7e8d7..a54e8c62 100644
--- a/java/src/com/android/intentresolver/ChooserActionFactory.java
+++ b/java/src/com/android/intentresolver/ChooserActionFactory.java
@@ -37,6 +37,7 @@ import android.view.View;
 import com.android.intentresolver.chooser.DisplayResolveInfo;
 import com.android.intentresolver.chooser.TargetInfo;
 import com.android.intentresolver.contentpreview.ChooserContentPreviewUi;
+import com.android.intentresolver.logging.EventLog;
 import com.android.intentresolver.widget.ActionRow;
 import com.android.internal.annotations.VisibleForTesting;
 
@@ -97,7 +98,7 @@ public final class ChooserActionFactory implements ChooserContentPreviewUi.Actio
     private final @Nullable ChooserAction mModifyShareAction;
     private final Consumer<Boolean> mExcludeSharedTextAction;
     private final Consumer</* @Nullable */ Integer> mFinishCallback;
-    private final ChooserActivityLogger mLogger;
+    private final EventLog mLogger;
 
     /**
      * @param context
@@ -116,7 +117,7 @@ public final class ChooserActionFactory implements ChooserContentPreviewUi.Actio
             Context context,
             ChooserRequestParameters chooserRequest,
             ChooserIntegratedDeviceComponents integratedDeviceComponents,
-            ChooserActivityLogger logger,
+            EventLog logger,
             Consumer<Boolean> onUpdateSharedTextIsExcluded,
             Callable</* @Nullable */ View> firstVisibleImageQuery,
             ActionActivityStarter activityStarter,
@@ -152,7 +153,7 @@ public final class ChooserActionFactory implements ChooserContentPreviewUi.Actio
             List<ChooserAction> customActions,
             @Nullable ChooserAction modifyShareAction,
             Consumer<Boolean> onUpdateSharedTextIsExcluded,
-            ChooserActivityLogger logger,
+            EventLog logger,
             Consumer</* @Nullable */ Integer> finishCallback) {
         mContext = context;
         mCopyButtonRunnable = copyButtonRunnable;
@@ -208,7 +209,7 @@ public final class ChooserActionFactory implements ChooserContentPreviewUi.Actio
                 mModifyShareAction,
                 mFinishCallback,
                 () -> {
-                    mLogger.logActionSelected(ChooserActivityLogger.SELECTION_TYPE_MODIFY_SHARE);
+                    mLogger.logActionSelected(EventLog.SELECTION_TYPE_MODIFY_SHARE);
                 });
     }
 
@@ -232,7 +233,7 @@ public final class ChooserActionFactory implements ChooserContentPreviewUi.Actio
             Intent targetIntent,
             String referrerPackageName,
             Consumer<Integer> finishCallback,
-            ChooserActivityLogger logger) {
+            EventLog logger) {
         final ClipData clipData;
         try {
             clipData = extractTextToCopy(targetIntent);
@@ -248,7 +249,7 @@ public final class ChooserActionFactory implements ChooserContentPreviewUi.Actio
                     Context.CLIPBOARD_SERVICE);
             clipboardManager.setPrimaryClipAsPackage(clipData, referrerPackageName);
 
-            logger.logActionSelected(ChooserActivityLogger.SELECTION_TYPE_COPY);
+            logger.logActionSelected(EventLog.SELECTION_TYPE_COPY);
             finishCallback.accept(Activity.RESULT_OK);
         };
     }
@@ -327,10 +328,10 @@ public final class ChooserActionFactory implements ChooserContentPreviewUi.Actio
             TargetInfo editSharingTarget,
             Callable</* @Nullable */ View> firstVisibleImageQuery,
             ActionActivityStarter activityStarter,
-            ChooserActivityLogger logger) {
+            EventLog logger) {
         return () -> {
             // Log share completion via edit.
-            logger.logActionSelected(ChooserActivityLogger.SELECTION_TYPE_EDIT);
+            logger.logActionSelected(EventLog.SELECTION_TYPE_EDIT);
 
             View firstImageView = null;
             try {
diff --git a/java/src/com/android/intentresolver/ChooserActivity.java b/java/src/com/android/intentresolver/ChooserActivity.java
index 7ebcf9f9..b041475b 100644
--- a/java/src/com/android/intentresolver/ChooserActivity.java
+++ b/java/src/com/android/intentresolver/ChooserActivity.java
@@ -92,6 +92,7 @@ import com.android.intentresolver.flags.FeatureFlagRepositoryFactory;
 import com.android.intentresolver.grid.ChooserGridAdapter;
 import com.android.intentresolver.icons.DefaultTargetDataLoader;
 import com.android.intentresolver.icons.TargetDataLoader;
+import com.android.intentresolver.logging.EventLog;
 import com.android.intentresolver.measurements.Tracer;
 import com.android.intentresolver.model.AbstractResolverComparator;
 import com.android.intentresolver.model.AppPredictionServiceResolverComparator;
@@ -193,7 +194,7 @@ public class ChooserActivity extends ResolverActivity implements
 
     private boolean mShouldDisplayLandscape;
     // statsd logger wrapper
-    protected ChooserActivityLogger mChooserActivityLogger;
+    protected EventLog mEventLog;
 
     private long mChooserShownTime;
     protected boolean mIsSuccessfullySelected;
@@ -236,7 +237,7 @@ public class ChooserActivity extends ResolverActivity implements
         final long intentReceivedTime = System.currentTimeMillis();
         mLatencyTracker.onActionStart(ACTION_LOAD_SHARE_SHEET);
 
-        getChooserActivityLogger().logSharesheetTriggered();
+        getEventLog().logSharesheetTriggered();
 
         mFeatureFlagRepository = createFeatureFlagRepository();
         mIntegratedDeviceComponents = getIntegratedDeviceComponents();
@@ -314,7 +315,7 @@ public class ChooserActivity extends ResolverActivity implements
 
         mChooserShownTime = System.currentTimeMillis();
         final long systemCost = mChooserShownTime - intentReceivedTime;
-        getChooserActivityLogger().logChooserActivityShown(
+        getEventLog().logChooserActivityShown(
                 isWorkProfile(), mChooserRequest.getTargetType(), systemCost);
 
         if (mResolverDrawerLayout != null) {
@@ -323,7 +324,7 @@ public class ChooserActivity extends ResolverActivity implements
             mResolverDrawerLayout.setOnCollapsedChangedListener(
                     isCollapsed -> {
                         mChooserMultiProfilePagerAdapter.setIsCollapsed(isCollapsed);
-                        getChooserActivityLogger().logSharesheetExpansionChanged(isCollapsed);
+                        getEventLog().logSharesheetExpansionChanged(isCollapsed);
                     });
         }
 
@@ -331,7 +332,7 @@ public class ChooserActivity extends ResolverActivity implements
             Log.d(TAG, "System Time Cost is " + systemCost);
         }
 
-        getChooserActivityLogger().logShareStarted(
+        getEventLog().logShareStarted(
                 getReferrerPackageName(),
                 mChooserRequest.getTargetType(),
                 mChooserRequest.getCallerChooserTargets().size(),
@@ -550,7 +551,7 @@ public class ChooserActivity extends ResolverActivity implements
         if (shouldShowStickyContentPreview()
                 || mChooserMultiProfilePagerAdapter
                         .getCurrentRootAdapter().getSystemRowCount() != 0) {
-            getChooserActivityLogger().logActionShareWithPreview(
+            getEventLog().logActionShareWithPreview(
                     mChooserContentPreviewUi.getPreferredContentPreview());
         }
         return postRebuildListInternal(rebuildCompleted);
@@ -910,8 +911,8 @@ public class ChooserActivity extends ResolverActivity implements
         if ((currentListAdapter.getCount() > 0) && (targetInfo != null)) {
             switch (currentListAdapter.getPositionTargetType(which)) {
                 case ChooserListAdapter.TARGET_SERVICE:
-                    getChooserActivityLogger().logShareTargetSelected(
-                            ChooserActivityLogger.SELECTION_TYPE_SERVICE,
+                    getEventLog().logShareTargetSelected(
+                            EventLog.SELECTION_TYPE_SERVICE,
                             targetInfo.getResolveInfo().activityInfo.processName,
                             which,
                             /* directTargetAlsoRanked= */ getRankedPosition(targetInfo),
@@ -924,8 +925,8 @@ public class ChooserActivity extends ResolverActivity implements
                     return;
                 case ChooserListAdapter.TARGET_CALLER:
                 case ChooserListAdapter.TARGET_STANDARD:
-                    getChooserActivityLogger().logShareTargetSelected(
-                            ChooserActivityLogger.SELECTION_TYPE_APP,
+                    getEventLog().logShareTargetSelected(
+                            EventLog.SELECTION_TYPE_APP,
                             targetInfo.getResolveInfo().activityInfo.processName,
                             (which - currentListAdapter.getSurfacedTargetInfo().size()),
                             /* directTargetAlsoRanked= */ -1,
@@ -941,8 +942,8 @@ public class ChooserActivity extends ResolverActivity implements
                     // they are from the alphabetical pool.
                     // TODO: why do we log a different selection type if the -1 value already
                     // designates the same condition?
-                    getChooserActivityLogger().logShareTargetSelected(
-                            ChooserActivityLogger.SELECTION_TYPE_STANDARD,
+                    getEventLog().logShareTargetSelected(
+                            EventLog.SELECTION_TYPE_STANDARD,
                             targetInfo.getResolveInfo().activityInfo.processName,
                             /* value= */ -1,
                             /* directTargetAlsoRanked= */ -1,
@@ -994,7 +995,7 @@ public class ChooserActivity extends ResolverActivity implements
         if (profileRecord == null) {
             return;
         }
-        getChooserActivityLogger().logDirectShareTargetReceived(
+        getEventLog().logDirectShareTargetReceived(
                 MetricsEvent.ACTION_DIRECT_SHARE_TARGETS_LOADED_SHORTCUT_MANAGER,
                 (int) (SystemClock.elapsedRealtime() - profileRecord.loadingStartTime));
     }
@@ -1128,11 +1129,11 @@ public class ChooserActivity extends ResolverActivity implements
         }
     }
 
-    protected ChooserActivityLogger getChooserActivityLogger() {
-        if (mChooserActivityLogger == null) {
-            mChooserActivityLogger = new ChooserActivityLogger();
+    protected EventLog getEventLog() {
+        if (mEventLog == null) {
+            mEventLog = new EventLog();
         }
-        return mChooserActivityLogger;
+        return mEventLog;
     }
 
     public class ChooserListController extends ResolverListController {
@@ -1258,7 +1259,7 @@ public class ChooserActivity extends ResolverActivity implements
                 targetIntent,
                 this,
                 context.getPackageManager(),
-                getChooserActivityLogger(),
+                getEventLog(),
                 chooserRequest,
                 maxTargetsPerRow,
                 initialIntentsUserSpace,
@@ -1282,7 +1283,7 @@ public class ChooserActivity extends ResolverActivity implements
         AbstractResolverComparator resolverComparator;
         if (appPredictor != null) {
             resolverComparator = new AppPredictionServiceResolverComparator(this, getTargetIntent(),
-                    getReferrerPackageName(), appPredictor, userHandle, getChooserActivityLogger(),
+                    getReferrerPackageName(), appPredictor, userHandle, getEventLog(),
                     getIntegratedDeviceComponents().getNearbySharingComponent());
         } else {
             resolverComparator =
@@ -1291,7 +1292,7 @@ public class ChooserActivity extends ResolverActivity implements
                             getTargetIntent(),
                             getReferrerPackageName(),
                             null,
-                            getChooserActivityLogger(),
+                            getEventLog(),
                             getResolverRankerServiceUserHandleList(userHandle),
                             getIntegratedDeviceComponents().getNearbySharingComponent());
         }
@@ -1316,7 +1317,7 @@ public class ChooserActivity extends ResolverActivity implements
                 this,
                 mChooserRequest,
                 mIntegratedDeviceComponents,
-                getChooserActivityLogger(),
+                getEventLog(),
                 (isExcluded) -> mExcludeSharedText = isExcluded,
                 this::getFirstVisibleImgPreviewView,
                 new ChooserActionFactory.ActionActivityStarter() {
@@ -1531,7 +1532,7 @@ public class ChooserActivity extends ResolverActivity implements
                 Log.d(TAG, "app target loading time " + duration + " ms");
             }
             addCallerChooserTargets();
-            getChooserActivityLogger().logSharesheetAppLoadComplete();
+            getEventLog().logSharesheetAppLoadComplete();
             maybeQueryAdditionalPostProcessingTargets(chooserListAdapter);
             mLatencyTracker.onActionEnd(ACTION_LOAD_SHARE_SHEET);
         }
@@ -1578,7 +1579,7 @@ public class ChooserActivity extends ResolverActivity implements
         }
         logDirectShareTargetReceived(userHandle);
         sendVoiceChoicesIfNeeded();
-        getChooserActivityLogger().logSharesheetDirectLoadComplete();
+        getEventLog().logSharesheetDirectLoadComplete();
     }
 
     private void setupScrollListener() {
@@ -1884,7 +1885,7 @@ public class ChooserActivity extends ResolverActivity implements
 
     @Override
     protected void maybeLogProfileChange() {
-        getChooserActivityLogger().logSharesheetProfileChanged();
+        getEventLog().logSharesheetProfileChanged();
     }
 
     private static class ProfileRecord {
diff --git a/java/src/com/android/intentresolver/ChooserListAdapter.java b/java/src/com/android/intentresolver/ChooserListAdapter.java
index de947bd1..e6d6dbf4 100644
--- a/java/src/com/android/intentresolver/ChooserListAdapter.java
+++ b/java/src/com/android/intentresolver/ChooserListAdapter.java
@@ -49,6 +49,7 @@ import com.android.intentresolver.chooser.NotSelectableTargetInfo;
 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.annotations.VisibleForTesting;
 import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;
 
@@ -80,7 +81,7 @@ public class ChooserListAdapter extends ResolverListAdapter {
     private final ChooserRequestParameters mChooserRequest;
     private final int mMaxRankedTargets;
 
-    private final ChooserActivityLogger mChooserActivityLogger;
+    private final EventLog mEventLog;
 
     private final Set<TargetInfo> mRequestedIcons = new HashSet<>();
 
@@ -139,7 +140,7 @@ public class ChooserListAdapter extends ResolverListAdapter {
             Intent targetIntent,
             ResolverListCommunicator resolverListCommunicator,
             PackageManager packageManager,
-            ChooserActivityLogger chooserActivityLogger,
+            EventLog eventLog,
             ChooserRequestParameters chooserRequest,
             int maxRankedTargets,
             UserHandle initialIntentsUserSpace,
@@ -165,7 +166,7 @@ public class ChooserListAdapter extends ResolverListAdapter {
         mPlaceHolderTargetInfo = NotSelectableTargetInfo.newPlaceHolderTargetInfo(context);
         mTargetDataLoader = targetDataLoader;
         createPlaceHolders();
-        mChooserActivityLogger = chooserActivityLogger;
+        mEventLog = eventLog;
         mShortcutSelectionLogic = new ShortcutSelectionLogic(
                 context.getResources().getInteger(R.integer.config_maxShortcutTargetsPerApp),
                 DeviceConfig.getBoolean(
@@ -633,7 +634,7 @@ public class ChooserListAdapter extends ResolverListAdapter {
         mServiceTargets.removeIf(o -> o.isPlaceHolderTargetInfo());
         if (mServiceTargets.isEmpty()) {
             mServiceTargets.add(NotSelectableTargetInfo.newEmptyTargetInfo());
-            mChooserActivityLogger.logSharesheetEmptyDirectShareRow();
+            mEventLog.logSharesheetEmptyDirectShareRow();
         }
         notifyDataSetChanged();
     }
diff --git a/java/src/com/android/intentresolver/ChooserActivityLogger.java b/java/src/com/android/intentresolver/logging/EventLog.java
index 1f606f26..b30e825b 100644
--- a/java/src/com/android/intentresolver/ChooserActivityLogger.java
+++ b/java/src/com/android/intentresolver/logging/EventLog.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 android.annotation.Nullable;
 import android.content.Intent;
@@ -24,6 +24,7 @@ import android.provider.MediaStore;
 import android.util.HashedStringCache;
 import android.util.Log;
 
+import com.android.intentresolver.ChooserActivity;
 import com.android.intentresolver.contentpreview.ContentPreviewType;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.logging.InstanceId;
@@ -39,7 +40,7 @@ import com.android.internal.util.FrameworkStatsLog;
  * Helper for writing Sharesheet atoms to statsd log.
  * @hide
  */
-public class ChooserActivityLogger {
+public class EventLog {
     private static final String TAG = "ChooserActivity";
     private static final boolean DEBUG = true;
 
@@ -94,12 +95,12 @@ public class ChooserActivityLogger {
     private final FrameworkStatsLogger mFrameworkStatsLogger;
     private final MetricsLogger mMetricsLogger;
 
-    public ChooserActivityLogger() {
+    public EventLog() {
         this(new UiEventLoggerImpl(), new DefaultFrameworkStatsLogger(), new MetricsLogger());
     }
 
     @VisibleForTesting
-    ChooserActivityLogger(
+    EventLog(
             UiEventLogger uiEventLogger,
             FrameworkStatsLogger frameworkLogger,
             MetricsLogger metricsLogger) {
diff --git a/java/src/com/android/intentresolver/model/AbstractResolverComparator.java b/java/src/com/android/intentresolver/model/AbstractResolverComparator.java
index bc54e01e..ff2d6a0f 100644
--- a/java/src/com/android/intentresolver/model/AbstractResolverComparator.java
+++ b/java/src/com/android/intentresolver/model/AbstractResolverComparator.java
@@ -30,7 +30,7 @@ import android.os.Message;
 import android.os.UserHandle;
 import android.util.Log;
 
-import com.android.intentresolver.ChooserActivityLogger;
+import com.android.intentresolver.logging.EventLog;
 import com.android.intentresolver.ResolvedComponentInfo;
 import com.android.intentresolver.ResolverActivity;
 import com.android.intentresolver.chooser.TargetInfo;
@@ -72,7 +72,7 @@ public abstract class AbstractResolverComparator implements Comparator<ResolvedC
     private static final int WATCHDOG_TIMEOUT_MILLIS = 500;
 
     private final Comparator<ResolveInfo> mAzComparator;
-    private ChooserActivityLogger mChooserActivityLogger;
+    private EventLog mEventLog;
 
     protected final Handler mHandler = new Handler(Looper.getMainLooper()) {
         public void handleMessage(Message msg) {
@@ -94,8 +94,8 @@ public abstract class AbstractResolverComparator implements Comparator<ResolvedC
                     }
                     mHandler.removeMessages(RANKER_SERVICE_RESULT);
                     afterCompute();
-                    if (mChooserActivityLogger != null) {
-                        mChooserActivityLogger.logSharesheetAppShareRankingTimeout();
+                    if (mEventLog != null) {
+                        mEventLog.logSharesheetAppShareRankingTimeout();
                     }
                     break;
 
@@ -161,12 +161,12 @@ public abstract class AbstractResolverComparator implements Comparator<ResolvedC
         mAfterCompute = afterCompute;
     }
 
-    void setChooserActivityLogger(ChooserActivityLogger chooserActivityLogger) {
-        mChooserActivityLogger = chooserActivityLogger;
+    void setEventLog(EventLog eventLog) {
+        mEventLog = eventLog;
     }
 
-    ChooserActivityLogger getChooserActivityLogger() {
-        return mChooserActivityLogger;
+    EventLog getEventLog() {
+        return mEventLog;
     }
 
     protected final void afterCompute() {
diff --git a/java/src/com/android/intentresolver/model/AppPredictionServiceResolverComparator.java b/java/src/com/android/intentresolver/model/AppPredictionServiceResolverComparator.java
index ba054731..621ae306 100644
--- a/java/src/com/android/intentresolver/model/AppPredictionServiceResolverComparator.java
+++ b/java/src/com/android/intentresolver/model/AppPredictionServiceResolverComparator.java
@@ -31,7 +31,7 @@ import android.os.Message;
 import android.os.UserHandle;
 import android.util.Log;
 
-import com.android.intentresolver.ChooserActivityLogger;
+import com.android.intentresolver.logging.EventLog;
 import com.android.intentresolver.ResolvedComponentInfo;
 import com.android.intentresolver.chooser.TargetInfo;
 
@@ -72,7 +72,7 @@ public class AppPredictionServiceResolverComparator extends AbstractResolverComp
             String referrerPackage,
             AppPredictor appPredictor,
             UserHandle user,
-            ChooserActivityLogger chooserActivityLogger,
+            EventLog eventLog,
             @Nullable ComponentName promoteToFirst) {
         super(context, intent, Lists.newArrayList(user), promoteToFirst);
         mContext = context;
@@ -80,7 +80,7 @@ public class AppPredictionServiceResolverComparator extends AbstractResolverComp
         mAppPredictor = appPredictor;
         mUser = user;
         mReferrerPackage = referrerPackage;
-        setChooserActivityLogger(chooserActivityLogger);
+        setEventLog(eventLog);
         mComparatorModel = buildUpdatedModel();
     }
 
@@ -116,7 +116,7 @@ public class AppPredictionServiceResolverComparator extends AbstractResolverComp
                                         mIntent,
                                         mReferrerPackage,
                                         () -> mHandler.sendEmptyMessage(RANKER_SERVICE_RESULT),
-                                        getChooserActivityLogger(),
+                                        getEventLog(),
                                         mUser,
                                         mPromoteToFirst);
                         mComparatorModel = buildUpdatedModel();
diff --git a/java/src/com/android/intentresolver/model/ResolverRankerServiceResolverComparator.java b/java/src/com/android/intentresolver/model/ResolverRankerServiceResolverComparator.java
index ebaffc36..7d473660 100644
--- a/java/src/com/android/intentresolver/model/ResolverRankerServiceResolverComparator.java
+++ b/java/src/com/android/intentresolver/model/ResolverRankerServiceResolverComparator.java
@@ -39,7 +39,7 @@ import android.service.resolver.ResolverRankerService;
 import android.service.resolver.ResolverTarget;
 import android.util.Log;
 
-import com.android.intentresolver.ChooserActivityLogger;
+import com.android.intentresolver.logging.EventLog;
 import com.android.intentresolver.ResolvedComponentInfo;
 import com.android.intentresolver.chooser.TargetInfo;
 import com.android.internal.logging.MetricsLogger;
@@ -102,9 +102,9 @@ public class ResolverRankerServiceResolverComparator extends AbstractResolverCom
      */
     public ResolverRankerServiceResolverComparator(Context launchedFromContext, Intent intent,
             String referrerPackage, Runnable afterCompute,
-            ChooserActivityLogger chooserActivityLogger, UserHandle targetUserSpace,
+            EventLog eventLog, UserHandle targetUserSpace,
             ComponentName promoteToFirst) {
-        this(launchedFromContext, intent, referrerPackage, afterCompute, chooserActivityLogger,
+        this(launchedFromContext, intent, referrerPackage, afterCompute, eventLog,
                 Lists.newArrayList(targetUserSpace), promoteToFirst);
     }
 
@@ -118,7 +118,7 @@ public class ResolverRankerServiceResolverComparator extends AbstractResolverCom
      */
     public ResolverRankerServiceResolverComparator(Context launchedFromContext, Intent intent,
             String referrerPackage, Runnable afterCompute,
-            ChooserActivityLogger chooserActivityLogger, List<UserHandle> targetUserSpaceList,
+            EventLog eventLog, List<UserHandle> targetUserSpaceList,
             @Nullable ComponentName promoteToFirst) {
         super(launchedFromContext, intent, targetUserSpaceList, promoteToFirst);
         mCollator = Collator.getInstance(
@@ -139,7 +139,7 @@ public class ResolverRankerServiceResolverComparator extends AbstractResolverCom
         mAction = intent.getAction();
         mRankerServiceName = new ComponentName(mContext, this.getClass());
         setCallBack(afterCompute);
-        setChooserActivityLogger(chooserActivityLogger);
+        setEventLog(eventLog);
 
         mComparatorModel = buildUpdatedModel();
     }
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);
     }
 }