From e2b2432bc64fbbca667f11c79d0dc5e4f627284b Mon Sep 17 00:00:00 2001 From: Muhammad Qureshi Date: Tue, 28 Jan 2020 10:54:17 -0800 Subject: Use FrameworkStatsLog instead of StatsLog As part of statsd becoming a Mainline module in R, autogenerated StatsLog.write() calls are going away and replaced by *StatsLog.java that is autogenerated for each module. This CL replaces some usages of StatsLog with FrameworkStatsLog. Bug: 145952197 Test: m Change-Id: Iaa2db34a7be4c3215f62cc36661ba8ac81656baa --- .../contentcapture/ContentCaptureMetricsLogger.java | 17 +++++++++-------- .../contentcapture/ContentCapturePerUserService.java | 12 ++++++------ .../contentcapture/RemoteContentCaptureService.java | 18 +++++++++++------- 3 files changed, 26 insertions(+), 21 deletions(-) (limited to 'services/contentcapture/java') diff --git a/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureMetricsLogger.java b/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureMetricsLogger.java index dd1b84b16f68..7ea4eff3381c 100644 --- a/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureMetricsLogger.java +++ b/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureMetricsLogger.java @@ -20,7 +20,8 @@ import android.annotation.Nullable; import android.content.ComponentName; import android.content.ContentCaptureOptions; import android.service.contentcapture.FlushMetrics; -import android.util.StatsLog; + +import com.android.internal.util.FrameworkStatsLog; import java.util.List; @@ -35,8 +36,8 @@ public final class ContentCaptureMetricsLogger { /** @hide */ public static void writeServiceEvent(int eventType, @NonNull String serviceName, @Nullable String targetPackage) { - StatsLog.write(StatsLog.CONTENT_CAPTURE_SERVICE_EVENTS, eventType, serviceName, - targetPackage); + FrameworkStatsLog.write(FrameworkStatsLog.CONTENT_CAPTURE_SERVICE_EVENTS, eventType, + serviceName, targetPackage); } /** @hide */ @@ -79,16 +80,16 @@ public final class ContentCaptureMetricsLogger { stringBuilder.append(activities.get(i).flattenToShortString()); } } - StatsLog.write(StatsLog.CONTENT_CAPTURE_SERVICE_EVENTS, - StatsLog.CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__SET_WHITELIST, + FrameworkStatsLog.write(FrameworkStatsLog.CONTENT_CAPTURE_SERVICE_EVENTS, + FrameworkStatsLog.CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__SET_WHITELIST, serviceName, stringBuilder.toString()); } /** @hide */ public static void writeSessionEvent(int sessionId, int event, int flags, @NonNull ComponentName service, @Nullable ComponentName app, boolean isChildSession) { - StatsLog.write(StatsLog.CONTENT_CAPTURE_SESSION_EVENTS, sessionId, event, flags, - ComponentName.flattenToShortString(service), + FrameworkStatsLog.write(FrameworkStatsLog.CONTENT_CAPTURE_SESSION_EVENTS, sessionId, event, + flags, ComponentName.flattenToShortString(service), ComponentName.flattenToShortString(app), isChildSession); } @@ -96,7 +97,7 @@ public final class ContentCaptureMetricsLogger { public static void writeSessionFlush(int sessionId, @NonNull ComponentName service, @Nullable ComponentName app, @NonNull FlushMetrics fm, @NonNull ContentCaptureOptions options, int flushReason) { - StatsLog.write(StatsLog.CONTENT_CAPTURE_FLUSHED, sessionId, + FrameworkStatsLog.write(FrameworkStatsLog.CONTENT_CAPTURE_FLUSHED, sessionId, ComponentName.flattenToShortString(service), ComponentName.flattenToShortString(app), fm.sessionStarted, fm.sessionFinished, fm.viewAppearedCount, fm.viewDisappearedCount, fm.viewTextChangedCount, diff --git a/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java b/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java index 0f1122e3886a..583c5b593b88 100644 --- a/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java +++ b/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java @@ -61,13 +61,13 @@ import android.util.ArraySet; import android.util.Slog; import android.util.SparseArray; import android.util.SparseBooleanArray; -import android.util.StatsLog; import android.view.contentcapture.ContentCaptureCondition; import android.view.contentcapture.DataRemovalRequest; import android.view.contentcapture.DataShareRequest; import com.android.internal.annotations.GuardedBy; import com.android.internal.os.IResultReceiver; +import com.android.internal.util.FrameworkStatsLog; import com.android.server.LocalServices; import com.android.server.contentcapture.RemoteContentCaptureService.ContentCaptureServiceCallbacks; import com.android.server.infra.AbstractPerUserSystemService; @@ -275,7 +275,7 @@ final class ContentCapturePerUserService /* binder= */ null); // Log metrics. writeSessionEvent(sessionId, - StatsLog.CONTENT_CAPTURE_SESSION_EVENTS__EVENT__SESSION_NOT_CREATED, + FrameworkStatsLog.CONTENT_CAPTURE_SESSION_EVENTS__EVENT__SESSION_NOT_CREATED, STATE_DISABLED | STATE_NO_SERVICE, serviceComponentName, componentName, /* isChildSession= */ false); return; @@ -299,7 +299,7 @@ final class ContentCapturePerUserService /* binder= */ null); // Log metrics. writeSessionEvent(sessionId, - StatsLog.CONTENT_CAPTURE_SESSION_EVENTS__EVENT__SESSION_NOT_CREATED, + FrameworkStatsLog.CONTENT_CAPTURE_SESSION_EVENTS__EVENT__SESSION_NOT_CREATED, STATE_DISABLED | STATE_NOT_WHITELISTED, serviceComponentName, componentName, /* isChildSession= */ false); return; @@ -313,7 +313,7 @@ final class ContentCapturePerUserService /* binder=*/ null); // Log metrics. writeSessionEvent(sessionId, - StatsLog.CONTENT_CAPTURE_SESSION_EVENTS__EVENT__SESSION_NOT_CREATED, + FrameworkStatsLog.CONTENT_CAPTURE_SESSION_EVENTS__EVENT__SESSION_NOT_CREATED, STATE_DISABLED | STATE_DUPLICATED_ID, serviceComponentName, componentName, /* isChildSession= */ false); return; @@ -330,7 +330,7 @@ final class ContentCapturePerUserService /* binder= */ null); // Log metrics. writeSessionEvent(sessionId, - StatsLog.CONTENT_CAPTURE_SESSION_EVENTS__EVENT__SESSION_NOT_CREATED, + FrameworkStatsLog.CONTENT_CAPTURE_SESSION_EVENTS__EVENT__SESSION_NOT_CREATED, STATE_DISABLED | STATE_NO_SERVICE, serviceComponentName, componentName, /* isChildSession= */ false); return; @@ -651,7 +651,7 @@ final class ContentCapturePerUserService } finally { Binder.restoreCallingIdentity(token); } - writeServiceEvent(StatsLog.CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__SET_DISABLED, + writeServiceEvent(FrameworkStatsLog.CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__SET_DISABLED, getServiceComponentName()); } diff --git a/services/contentcapture/java/com/android/server/contentcapture/RemoteContentCaptureService.java b/services/contentcapture/java/com/android/server/contentcapture/RemoteContentCaptureService.java index c16df0f19943..9a170ac6da10 100644 --- a/services/contentcapture/java/com/android/server/contentcapture/RemoteContentCaptureService.java +++ b/services/contentcapture/java/com/android/server/contentcapture/RemoteContentCaptureService.java @@ -32,13 +32,13 @@ import android.service.contentcapture.IContentCaptureServiceCallback; import android.service.contentcapture.IDataShareCallback; import android.service.contentcapture.SnapshotData; import android.util.Slog; -import android.util.StatsLog; import android.view.contentcapture.ContentCaptureContext; import android.view.contentcapture.DataRemovalRequest; import android.view.contentcapture.DataShareRequest; import com.android.internal.infra.AbstractMultiplePendingRequestsRemoteService; import com.android.internal.os.IResultReceiver; +import com.android.internal.util.FrameworkStatsLog; final class RemoteContentCaptureService extends AbstractMultiplePendingRequestsRemoteService s.onSessionStarted(context, sessionId, uid, clientReceiver, initialState)); // Metrics logging. writeSessionEvent(sessionId, - StatsLog.CONTENT_CAPTURE_SESSION_EVENTS__EVENT__ON_SESSION_STARTED, initialState, - getComponentName(), context.getActivityComponent(), /* is_child_session= */ false); + FrameworkStatsLog.CONTENT_CAPTURE_SESSION_EVENTS__EVENT__ON_SESSION_STARTED, + initialState, getComponentName(), context.getActivityComponent(), + /* is_child_session= */ false); } /** @@ -126,7 +129,7 @@ final class RemoteContentCaptureService scheduleAsyncRequest((s) -> s.onSessionFinished(sessionId)); // Metrics logging. writeSessionEvent(sessionId, - StatsLog.CONTENT_CAPTURE_SESSION_EVENTS__EVENT__ON_SESSION_FINISHED, + FrameworkStatsLog.CONTENT_CAPTURE_SESSION_EVENTS__EVENT__ON_SESSION_FINISHED, /* flags= */ 0, getComponentName(), /* app= */ null, /* is_child_session= */ false); } @@ -143,7 +146,8 @@ final class RemoteContentCaptureService */ public void onDataRemovalRequest(@NonNull DataRemovalRequest request) { scheduleAsyncRequest((s) -> s.onDataRemovalRequest(request)); - writeServiceEvent(StatsLog.CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__ON_USER_DATA_REMOVED, + writeServiceEvent( + FrameworkStatsLog.CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__ON_USER_DATA_REMOVED, mComponentName); } -- cgit v1.2.3-59-g8ed1b