diff options
3 files changed, 23 insertions, 23 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityMetricsLogger.java b/services/core/java/com/android/server/wm/ActivityMetricsLogger.java index 23b94bdb74c8..2ef0015f2b7d 100644 --- a/services/core/java/com/android/server/wm/ActivityMetricsLogger.java +++ b/services/core/java/com/android/server/wm/ActivityMetricsLogger.java @@ -83,13 +83,13 @@ import android.util.ArrayMap; import android.util.EventLog; import android.util.Log; import android.util.Slog; -import android.util.StatsLog; import android.util.TimeUtils; import android.util.proto.ProtoOutputStream; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.MetricsLogger; import com.android.internal.os.BackgroundThread; +import com.android.internal.util.FrameworkStatsLog; import com.android.internal.util.function.pooled.PooledLambda; import com.android.server.LocalServices; @@ -768,8 +768,8 @@ class ActivityMetricsLogger { builder.setType(type); builder.addTaggedData(FIELD_CLASS_NAME, activity.info.name); mMetricsLogger.write(builder); - StatsLog.write( - StatsLog.APP_START_CANCELED, + FrameworkStatsLog.write( + FrameworkStatsLog.APP_START_CANCELED, activity.info.applicationInfo.uid, activity.packageName, convertAppStartTransitionType(type), @@ -844,8 +844,8 @@ class ActivityMetricsLogger { builder.addTaggedData(PACKAGE_OPTIMIZATION_COMPILATION_FILTER, packageOptimizationInfo.getCompilationFilter()); mMetricsLogger.write(builder); - StatsLog.write( - StatsLog.APP_START_OCCURRED, + FrameworkStatsLog.write( + FrameworkStatsLog.APP_START_OCCURRED, info.applicationInfo.uid, info.packageName, convertAppStartTransitionType(info.type), @@ -895,15 +895,15 @@ class ActivityMetricsLogger { private int convertAppStartTransitionType(int tronType) { if (tronType == TYPE_TRANSITION_COLD_LAUNCH) { - return StatsLog.APP_START_OCCURRED__TYPE__COLD; + return FrameworkStatsLog.APP_START_OCCURRED__TYPE__COLD; } if (tronType == TYPE_TRANSITION_WARM_LAUNCH) { - return StatsLog.APP_START_OCCURRED__TYPE__WARM; + return FrameworkStatsLog.APP_START_OCCURRED__TYPE__WARM; } if (tronType == TYPE_TRANSITION_HOT_LAUNCH) { - return StatsLog.APP_START_OCCURRED__TYPE__HOT; + return FrameworkStatsLog.APP_START_OCCURRED__TYPE__HOT; } - return StatsLog.APP_START_OCCURRED__TYPE__UNKNOWN; + return FrameworkStatsLog.APP_START_OCCURRED__TYPE__UNKNOWN; } /** @return the last known window drawn delay of the given activity. */ @@ -957,13 +957,13 @@ class ActivityMetricsLogger { builder.addTaggedData(APP_TRANSITION_PROCESS_RUNNING, info.mProcessRunning ? 1 : 0); mMetricsLogger.write(builder); - StatsLog.write( - StatsLog.APP_START_FULLY_DRAWN, + FrameworkStatsLog.write( + FrameworkStatsLog.APP_START_FULLY_DRAWN, info.mLastLaunchedActivity.info.applicationInfo.uid, info.mLastLaunchedActivity.packageName, restoredFromBundle - ? StatsLog.APP_START_FULLY_DRAWN__TYPE__WITH_BUNDLE - : StatsLog.APP_START_FULLY_DRAWN__TYPE__WITHOUT_BUNDLE, + ? FrameworkStatsLog.APP_START_FULLY_DRAWN__TYPE__WITH_BUNDLE + : FrameworkStatsLog.APP_START_FULLY_DRAWN__TYPE__WITHOUT_BUNDLE, info.mLastLaunchedActivity.info.name, info.mProcessRunning, startupTimeMs); @@ -1068,8 +1068,8 @@ class ActivityMetricsLogger { return; } - StatsLog.write( - StatsLog.APP_START_MEMORY_STATE_CAPTURED, + FrameworkStatsLog.write( + FrameworkStatsLog.APP_START_MEMORY_STATE_CAPTURED, uid, info.processName, info.launchedActivityName, diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index 976fbdb36bba..f019013eedf1 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -222,7 +222,6 @@ import android.util.ArraySet; import android.util.Log; import android.util.Slog; import android.util.SparseArray; -import android.util.StatsLog; import android.util.TimeUtils; import android.util.proto.ProtoOutputStream; import android.view.IRecentsAnimationRunner; @@ -248,6 +247,7 @@ import com.android.internal.policy.IKeyguardDismissCallback; import com.android.internal.policy.KeyguardDismissCallback; import com.android.internal.util.ArrayUtils; import com.android.internal.util.FastPrintWriter; +import com.android.internal.util.FrameworkStatsLog; import com.android.internal.util.function.pooled.PooledConsumer; import com.android.internal.util.function.pooled.PooledFunction; import com.android.internal.util.function.pooled.PooledLambda; @@ -5380,7 +5380,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { if (DEBUG_SWITCH || DEBUG_CONFIGURATION) Slog.i(TAG_CONFIGURATION, "Updating global configuration to: " + values); writeConfigurationChanged(changes); - StatsLog.write(StatsLog.RESOURCE_CONFIGURATION_CHANGED, + FrameworkStatsLog.write(FrameworkStatsLog.RESOURCE_CONFIGURATION_CHANGED, values.colorMode, values.densityDpi, values.fontScale, @@ -5699,8 +5699,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { // will wake up stacks or put them to sleep as appropriate. if (wasSleeping) { mSleeping = false; - StatsLog.write(StatsLog.ACTIVITY_MANAGER_SLEEP_STATE_CHANGED, - StatsLog.ACTIVITY_MANAGER_SLEEP_STATE_CHANGED__STATE__AWAKE); + FrameworkStatsLog.write(FrameworkStatsLog.ACTIVITY_MANAGER_SLEEP_STATE_CHANGED, + FrameworkStatsLog.ACTIVITY_MANAGER_SLEEP_STATE_CHANGED__STATE__AWAKE); startTimeTrackingFocusedActivityLocked(); mTopProcessState = ActivityManager.PROCESS_STATE_TOP; Slog.d(TAG, "Top Process State changed to PROCESS_STATE_TOP"); @@ -5712,8 +5712,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { } } else if (!mSleeping && shouldSleep) { mSleeping = true; - StatsLog.write(StatsLog.ACTIVITY_MANAGER_SLEEP_STATE_CHANGED, - StatsLog.ACTIVITY_MANAGER_SLEEP_STATE_CHANGED__STATE__ASLEEP); + FrameworkStatsLog.write(FrameworkStatsLog.ACTIVITY_MANAGER_SLEEP_STATE_CHANGED, + FrameworkStatsLog.ACTIVITY_MANAGER_SLEEP_STATE_CHANGED__STATE__ASLEEP); if (mCurAppTimeTracker != null) { mCurAppTimeTracker.stop(); } diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 874a25e50ae6..aab6b510ef1a 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -196,7 +196,6 @@ import android.util.ArraySet; import android.util.DisplayMetrics; import android.util.MergedConfiguration; import android.util.Slog; -import android.util.StatsLog; import android.util.TimeUtils; import android.util.proto.ProtoOutputStream; import android.view.Display; @@ -227,6 +226,7 @@ import android.view.animation.Interpolator; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.policy.KeyInterceptionInfo; +import com.android.internal.util.FrameworkStatsLog; import com.android.internal.util.ToBooleanFunction; import com.android.server.policy.WindowManagerPolicy; import com.android.server.protolog.common.ProtoLog; @@ -3154,7 +3154,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP final int requested = mLastRequestedExclusionHeight[side]; final int granted = mLastGrantedExclusionHeight[side]; - StatsLog.write(StatsLog.EXCLUSION_RECT_STATE_CHANGED, + FrameworkStatsLog.write(FrameworkStatsLog.EXCLUSION_RECT_STATE_CHANGED, mAttrs.packageName, requested, requested - granted /* rejected */, side + 1 /* Sides are 1-indexed in atoms.proto */, (getConfiguration().orientation == ORIENTATION_LANDSCAPE), |