diff options
8 files changed, 137 insertions, 135 deletions
diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index ffeea3d12781..982466d82d38 100644 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -19,12 +19,8 @@ package com.android.server.am; import static android.content.pm.PackageManager.PERMISSION_GRANTED; import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION; import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_MANIFEST; -import static android.os.Process.BLUETOOTH_UID; -import static android.os.Process.NETWORK_STACK_UID; import static android.os.Process.NFC_UID; -import static android.os.Process.PHONE_UID; import static android.os.Process.ROOT_UID; -import static android.os.Process.SE_UID; import static android.os.Process.SYSTEM_UID; import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_BACKGROUND_CHECK; @@ -89,7 +85,6 @@ import android.util.EventLog; import android.util.PrintWriterPrinter; import android.util.Slog; import android.util.SparseArray; -import android.util.StatsLog; import android.util.TimeUtils; import android.util.proto.ProtoOutputStream; import android.webkit.WebViewZygote; @@ -103,6 +98,7 @@ import com.android.internal.os.BatteryStatsImpl; import com.android.internal.os.TransferPipe; import com.android.internal.util.DumpUtils; import com.android.internal.util.FastPrintWriter; +import com.android.internal.util.FrameworkStatsLog; import com.android.server.AppStateTracker; import com.android.server.LocalServices; import com.android.server.SystemService; @@ -728,8 +724,9 @@ public final class ActiveServices { stracker.setStarted(true, mAm.mProcessStats.getMemFactorLocked(), r.lastActivity); } r.callStart = false; - StatsLog.write(StatsLog.SERVICE_STATE_CHANGED, r.appInfo.uid, r.name.getPackageName(), - r.name.getClassName(), StatsLog.SERVICE_STATE_CHANGED__STATE__START); + FrameworkStatsLog.write(FrameworkStatsLog.SERVICE_STATE_CHANGED, r.appInfo.uid, + r.name.getPackageName(), r.name.getClassName(), + FrameworkStatsLog.SERVICE_STATE_CHANGED__STATE__START); synchronized (r.stats.getBatteryStats()) { r.stats.startRunningLocked(); } @@ -768,9 +765,9 @@ public final class ActiveServices { service.delayedStop = true; return; } - StatsLog.write(StatsLog.SERVICE_STATE_CHANGED, service.appInfo.uid, + FrameworkStatsLog.write(FrameworkStatsLog.SERVICE_STATE_CHANGED, service.appInfo.uid, service.name.getPackageName(), service.name.getClassName(), - StatsLog.SERVICE_STATE_CHANGED__STATE__STOP); + FrameworkStatsLog.SERVICE_STATE_CHANGED__STATE__STOP); synchronized (service.stats.getBatteryStats()) { service.stats.stopRunningLocked(); } @@ -929,8 +926,9 @@ public final class ActiveServices { } } - StatsLog.write(StatsLog.SERVICE_STATE_CHANGED, r.appInfo.uid, r.name.getPackageName(), - r.name.getClassName(), StatsLog.SERVICE_STATE_CHANGED__STATE__STOP); + FrameworkStatsLog.write(FrameworkStatsLog.SERVICE_STATE_CHANGED, r.appInfo.uid, + r.name.getPackageName(), r.name.getClassName(), + FrameworkStatsLog.SERVICE_STATE_CHANGED__STATE__STOP); synchronized (r.stats.getBatteryStats()) { r.stats.stopRunningLocked(); } @@ -1435,9 +1433,9 @@ public final class ActiveServices { AppOpsManager.getToken(mAm.mAppOpsService), AppOpsManager.OP_START_FOREGROUND, r.appInfo.uid, r.packageName, null, true, false, ""); - StatsLog.write(StatsLog.FOREGROUND_SERVICE_STATE_CHANGED, + FrameworkStatsLog.write(FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED, r.appInfo.uid, r.shortInstanceName, - StatsLog.FOREGROUND_SERVICE_STATE_CHANGED__STATE__ENTER); + FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED__STATE__ENTER); mAm.updateForegroundServiceUsageStats(r.name, r.userId, true); } r.postNotification(); @@ -1486,9 +1484,9 @@ public final class ActiveServices { mAm.mAppOpsService.finishOperation( AppOpsManager.getToken(mAm.mAppOpsService), AppOpsManager.OP_START_FOREGROUND, r.appInfo.uid, r.packageName, null); - StatsLog.write(StatsLog.FOREGROUND_SERVICE_STATE_CHANGED, + FrameworkStatsLog.write(FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED, r.appInfo.uid, r.shortInstanceName, - StatsLog.FOREGROUND_SERVICE_STATE_CHANGED__STATE__EXIT); + FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED__STATE__EXIT); mAm.updateForegroundServiceUsageStats(r.name, r.userId, false); if (r.app != null) { mAm.updateLruProcessLocked(r.app, false, null); @@ -2772,8 +2770,8 @@ public final class ActiveServices { EventLogTags.writeAmCreateService( r.userId, System.identityHashCode(r), nameTerm, r.app.uid, r.app.pid); } - StatsLog.write(StatsLog.SERVICE_LAUNCH_REPORTED, r.appInfo.uid, r.name.getPackageName(), - r.name.getClassName()); + FrameworkStatsLog.write(FrameworkStatsLog.SERVICE_LAUNCH_REPORTED, r.appInfo.uid, + r.name.getPackageName(), r.name.getClassName()); synchronized (r.stats.getBatteryStats()) { r.stats.startLaunchedLocked(); } @@ -3101,8 +3099,9 @@ public final class ActiveServices { mAm.mAppOpsService.finishOperation( AppOpsManager.getToken(mAm.mAppOpsService), AppOpsManager.OP_START_FOREGROUND, r.appInfo.uid, r.packageName, null); - StatsLog.write(StatsLog.FOREGROUND_SERVICE_STATE_CHANGED, r.appInfo.uid, - r.shortInstanceName, StatsLog.FOREGROUND_SERVICE_STATE_CHANGED__STATE__EXIT); + FrameworkStatsLog.write(FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED, + r.appInfo.uid, r.shortInstanceName, + FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED__STATE__EXIT); mAm.updateForegroundServiceUsageStats(r.name, r.userId, false); } diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 4c5f705433d6..c58cb607a626 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -292,7 +292,6 @@ import android.util.PrintWriterPrinter; import android.util.Slog; import android.util.SparseArray; import android.util.SparseIntArray; -import android.util.StatsLog; import android.util.TimeUtils; import android.util.proto.ProtoOutputStream; import android.util.proto.ProtoUtils; @@ -325,6 +324,7 @@ import com.android.internal.os.Zygote; import com.android.internal.util.ArrayUtils; import com.android.internal.util.DumpUtils; import com.android.internal.util.FastPrintWriter; +import com.android.internal.util.FrameworkStatsLog; import com.android.internal.util.MemInfoReader; import com.android.internal.util.Preconditions; import com.android.internal.util.function.HexFunction; @@ -3069,10 +3069,10 @@ public class ActivityManagerService extends IActivityManager.Stub "updateBatteryStats: comp=" + activity + "res=" + resumed); } final BatteryStatsImpl stats = mBatteryStatsService.getActiveStatistics(); - StatsLog.write(StatsLog.ACTIVITY_FOREGROUND_STATE_CHANGED, + FrameworkStatsLog.write(FrameworkStatsLog.ACTIVITY_FOREGROUND_STATE_CHANGED, uid, activity.getPackageName(), activity.getShortClassName(), - resumed ? StatsLog.ACTIVITY_FOREGROUND_STATE_CHANGED__STATE__FOREGROUND : - StatsLog.ACTIVITY_FOREGROUND_STATE_CHANGED__STATE__BACKGROUND); + resumed ? FrameworkStatsLog.ACTIVITY_FOREGROUND_STATE_CHANGED__STATE__FOREGROUND : + FrameworkStatsLog.ACTIVITY_FOREGROUND_STATE_CHANGED__STATE__BACKGROUND); synchronized (stats) { if (resumed) { stats.noteActivityResumedLocked(uid); @@ -3796,7 +3796,7 @@ public class ActivityManagerService extends IActivityManager.Stub // On the device which doesn't have Cgroup, log LmkStateChanged which is used as a signal // for pulling memory stats of other running processes when this process died. if (!hasMemcg()) { - StatsLog.write(StatsLog.APP_DIED, SystemClock.elapsedRealtime()); + FrameworkStatsLog.write(FrameworkStatsLog.APP_DIED, SystemClock.elapsedRealtime()); } } @@ -4442,7 +4442,7 @@ public class ActivityManagerService extends IActivityManager.Stub proc.pkgList.mPkgList); for (int ipkg = proc.pkgList.size() - 1; ipkg >= 0; ipkg--) { ProcessStats.ProcessStateHolder holder = proc.pkgList.valueAt(ipkg); - StatsLog.write(StatsLog.PROCESS_MEMORY_STAT_REPORTED, + FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_MEMORY_STAT_REPORTED, proc.info.uid, holder.state.getName(), holder.state.getPackage(), @@ -4500,7 +4500,7 @@ public class ActivityManagerService extends IActivityManager.Stub ProcessStats.ADD_PSS_EXTERNAL, endTime-startTime, proc.pkgList.mPkgList); for (int ipkg = proc.pkgList.size() - 1; ipkg >= 0; ipkg--) { ProcessStats.ProcessStateHolder holder = proc.pkgList.valueAt(ipkg); - StatsLog.write(StatsLog.PROCESS_MEMORY_STAT_REPORTED, + FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_MEMORY_STAT_REPORTED, proc.info.uid, holder.state.getName(), holder.state.getPackage(), @@ -5223,12 +5223,12 @@ public class ActivityManagerService extends IActivityManager.Stub checkTime(startTime, "attachApplicationLocked: after updateOomAdjLocked"); } - StatsLog.write( - StatsLog.PROCESS_START_TIME, + FrameworkStatsLog.write( + FrameworkStatsLog.PROCESS_START_TIME, app.info.uid, app.pid, app.info.packageName, - StatsLog.PROCESS_START_TIME__TYPE__COLD, + FrameworkStatsLog.PROCESS_START_TIME__TYPE__COLD, app.startTime, (int) (bindApplicationTimeMillis - app.startTime), (int) (SystemClock.elapsedRealtime() - app.startTime), @@ -8843,8 +8843,8 @@ public class ActivityManagerService extends IActivityManager.Stub UserHandle.getUserId(workSourceUid), SystemClock.elapsedRealtime()); } - StatsLog.write(StatsLog.WAKEUP_ALARM_OCCURRED, workSource, tag, sourcePkg, - standbyBucket); + FrameworkStatsLog.write(FrameworkStatsLog.WAKEUP_ALARM_OCCURRED, workSource, tag, + sourcePkg, standbyBucket); if (DEBUG_POWER) { Slog.w(TAG, "noteWakeupAlarm[ sourcePkg=" + sourcePkg + ", sourceUid=" + sourceUid + ", workSource=" + workSource + ", tag=" + tag + ", standbyBucket=" @@ -8855,8 +8855,8 @@ public class ActivityManagerService extends IActivityManager.Stub standbyBucket = mUsageStatsService.getAppStandbyBucket(sourcePkg, UserHandle.getUserId(sourceUid), SystemClock.elapsedRealtime()); } - StatsLog.write_non_chained(StatsLog.WAKEUP_ALARM_OCCURRED, sourceUid, null, tag, - sourcePkg, standbyBucket); + FrameworkStatsLog.write_non_chained(FrameworkStatsLog.WAKEUP_ALARM_OCCURRED, sourceUid, + null, tag, sourcePkg, standbyBucket); if (DEBUG_POWER) { Slog.w(TAG, "noteWakeupAlarm[ sourcePkg=" + sourcePkg + ", sourceUid=" + sourceUid + ", workSource=" + workSource + ", tag=" + tag + ", standbyBucket=" @@ -9590,20 +9590,20 @@ public class ActivityManagerService extends IActivityManager.Stub crashInfo.throwFileName, crashInfo.throwLineNumber); - StatsLog.write(StatsLog.APP_CRASH_OCCURRED, + FrameworkStatsLog.write(FrameworkStatsLog.APP_CRASH_OCCURRED, Binder.getCallingUid(), eventType, processName, Binder.getCallingPid(), (r != null && r.info != null) ? r.info.packageName : "", (r != null && r.info != null) ? (r.info.isInstantApp() - ? StatsLog.APP_CRASH_OCCURRED__IS_INSTANT_APP__TRUE - : StatsLog.APP_CRASH_OCCURRED__IS_INSTANT_APP__FALSE) - : StatsLog.APP_CRASH_OCCURRED__IS_INSTANT_APP__UNAVAILABLE, + ? FrameworkStatsLog.APP_CRASH_OCCURRED__IS_INSTANT_APP__TRUE + : FrameworkStatsLog.APP_CRASH_OCCURRED__IS_INSTANT_APP__FALSE) + : FrameworkStatsLog.APP_CRASH_OCCURRED__IS_INSTANT_APP__UNAVAILABLE, r != null ? (r.isInterestingToUserLocked() - ? StatsLog.APP_CRASH_OCCURRED__FOREGROUND_STATE__FOREGROUND - : StatsLog.APP_CRASH_OCCURRED__FOREGROUND_STATE__BACKGROUND) - : StatsLog.APP_CRASH_OCCURRED__FOREGROUND_STATE__UNKNOWN, + ? FrameworkStatsLog.APP_CRASH_OCCURRED__FOREGROUND_STATE__FOREGROUND + : FrameworkStatsLog.APP_CRASH_OCCURRED__FOREGROUND_STATE__BACKGROUND) + : FrameworkStatsLog.APP_CRASH_OCCURRED__FOREGROUND_STATE__UNKNOWN, processName.equals("system_server") ? ServerProtoEnums.SYSTEM_SERVER : (r != null) ? r.getProcessClassEnum() : ServerProtoEnums.ERROR_SOURCE_UNKNOWN @@ -9788,7 +9788,7 @@ public class ActivityManagerService extends IActivityManager.Stub EventLogTags.writeAmWtf(UserHandle.getUserId(callingUid), callingPid, processName, r == null ? -1 : r.info.flags, tag, crashInfo.exceptionMessage); - StatsLog.write(StatsLog.WTF_OCCURRED, callingUid, tag, processName, + FrameworkStatsLog.write(FrameworkStatsLog.WTF_OCCURRED, callingUid, tag, processName, callingPid, (r != null) ? r.getProcessClassEnum() : 0); addErrorToDropBox("wtf", r, processName, null, null, null, tag, null, null, crashInfo); @@ -13027,7 +13027,7 @@ public class ActivityManagerService extends IActivityManager.Stub reportType, endTime-startTime, r.pkgList.mPkgList); for (int ipkg = r.pkgList.size() - 1; ipkg >= 0; ipkg--) { ProcessStats.ProcessStateHolder holder = r.pkgList.valueAt(ipkg); - StatsLog.write(StatsLog.PROCESS_MEMORY_STAT_REPORTED, + FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_MEMORY_STAT_REPORTED, r.info.uid, holder.state.getName(), holder.state.getPackage(), @@ -13631,7 +13631,7 @@ public class ActivityManagerService extends IActivityManager.Stub reportType, endTime-startTime, r.pkgList.mPkgList); for (int ipkg = r.pkgList.size() - 1; ipkg >= 0; ipkg--) { ProcessStats.ProcessStateHolder holder = r.pkgList.valueAt(ipkg); - StatsLog.write(StatsLog.PROCESS_MEMORY_STAT_REPORTED, + FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_MEMORY_STAT_REPORTED, r.info.uid, holder.state.getName(), holder.state.getPackage(), @@ -14198,7 +14198,7 @@ public class ActivityManagerService extends IActivityManager.Stub catPw.flush(); } dropBuilder.append(catSw.toString()); - StatsLog.write(StatsLog.LOW_MEM_REPORTED); + FrameworkStatsLog.write(FrameworkStatsLog.LOW_MEM_REPORTED); addErrorToDropBox("lowmem", null, "system_server", null, null, null, tag.toString(), dropBuilder.toString(), null, null); //Slog.i(TAG, "Sent to dropbox:"); @@ -16838,7 +16838,7 @@ public class ActivityManagerService extends IActivityManager.Stub pss, uss, rss, true, statType, pssDuration, proc.pkgList.mPkgList); for (int ipkg = proc.pkgList.mPkgList.size() - 1; ipkg >= 0; ipkg--) { ProcessStats.ProcessStateHolder holder = proc.pkgList.valueAt(ipkg); - StatsLog.write(StatsLog.PROCESS_MEMORY_STAT_REPORTED, + FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_MEMORY_STAT_REPORTED, proc.info.uid, holder.state.getName(), holder.state.getPackage(), @@ -17198,7 +17198,7 @@ public class ActivityManagerService extends IActivityManager.Stub app.baseProcessTracker.reportExcessiveCpu(app.pkgList.mPkgList); for (int ipkg = app.pkgList.size() - 1; ipkg >= 0; ipkg--) { ProcessStats.ProcessStateHolder holder = app.pkgList.valueAt(ipkg); - StatsLog.write(StatsLog.EXCESSIVE_CPU_USAGE_REPORTED, + FrameworkStatsLog.write(FrameworkStatsLog.EXCESSIVE_CPU_USAGE_REPORTED, app.info.uid, holder.state.getName(), holder.state.getPackage(), @@ -17485,7 +17485,7 @@ public class ActivityManagerService extends IActivityManager.Stub } if (memFactor != mLastMemoryLevel) { EventLogTags.writeAmMemFactor(memFactor, mLastMemoryLevel); - StatsLog.write(StatsLog.MEMORY_FACTOR_STATE_CHANGED, memFactor); + FrameworkStatsLog.write(FrameworkStatsLog.MEMORY_FACTOR_STATE_CHANGED, memFactor); } mLastMemoryLevel = memFactor; mLastNumProcesses = mProcessList.getLruSizeLocked(); diff --git a/services/core/java/com/android/server/am/BatteryExternalStatsWorker.java b/services/core/java/com/android/server/am/BatteryExternalStatsWorker.java index fa916202d553..d5fc14b1ac14 100644 --- a/services/core/java/com/android/server/am/BatteryExternalStatsWorker.java +++ b/services/core/java/com/android/server/am/BatteryExternalStatsWorker.java @@ -33,11 +33,11 @@ import android.telephony.ModemActivityInfo; import android.telephony.TelephonyManager; import android.util.IntArray; import android.util.Slog; -import android.util.StatsLog; import android.util.TimeUtils; import com.android.internal.annotations.GuardedBy; import com.android.internal.os.BatteryStatsImpl; +import com.android.internal.util.FrameworkStatsLog; import com.android.internal.util.function.pooled.PooledLambda; import libcore.util.EmptyArray; @@ -374,8 +374,8 @@ class BatteryExternalStatsWorker implements BatteryStatsImpl.ExternalStatsSync { // Clean up any UIDs if necessary. synchronized (mStats) { for (int uid : uidsToRemove) { - StatsLog.write(StatsLog.ISOLATED_UID_CHANGED, -1, uid, - StatsLog.ISOLATED_UID_CHANGED__EVENT__REMOVED); + FrameworkStatsLog.write(FrameworkStatsLog.ISOLATED_UID_CHANGED, -1, uid, + FrameworkStatsLog.ISOLATED_UID_CHANGED__EVENT__REMOVED); mStats.removeIsolatedUidLocked(uid); } mStats.clearPendingRemovedUids(); diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java index a98b83b09a6a..ed6ace3335f5 100644 --- a/services/core/java/com/android/server/am/BatteryStatsService.java +++ b/services/core/java/com/android/server/am/BatteryStatsService.java @@ -53,7 +53,6 @@ import android.telephony.ModemActivityInfo; import android.telephony.SignalStrength; import android.telephony.TelephonyManager; import android.util.Slog; -import android.util.StatsLog; import com.android.internal.app.IBatteryStats; import com.android.internal.os.BatteryStatsHelper; @@ -62,6 +61,7 @@ import com.android.internal.os.PowerProfile; import com.android.internal.os.RailStats; import com.android.internal.os.RpmStats; import com.android.internal.util.DumpUtils; +import com.android.internal.util.FrameworkStatsLog; import com.android.internal.util.ParseUtils; import com.android.server.LocalServices; @@ -347,16 +347,16 @@ public final class BatteryStatsService extends IBatteryStats.Stub void noteProcessStart(String name, int uid) { synchronized (mStats) { mStats.noteProcessStartLocked(name, uid); - StatsLog.write(StatsLog.PROCESS_LIFE_CYCLE_STATE_CHANGED, uid, name, - StatsLog.PROCESS_LIFE_CYCLE_STATE_CHANGED__STATE__STARTED); + FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_LIFE_CYCLE_STATE_CHANGED, uid, name, + FrameworkStatsLog.PROCESS_LIFE_CYCLE_STATE_CHANGED__STATE__STARTED); } } void noteProcessCrash(String name, int uid) { synchronized (mStats) { mStats.noteProcessCrashLocked(name, uid); - StatsLog.write(StatsLog.PROCESS_LIFE_CYCLE_STATE_CHANGED, uid, name, - StatsLog.PROCESS_LIFE_CYCLE_STATE_CHANGED__STATE__CRASHED); + FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_LIFE_CYCLE_STATE_CHANGED, uid, name, + FrameworkStatsLog.PROCESS_LIFE_CYCLE_STATE_CHANGED__STATE__CRASHED); } } @@ -369,15 +369,15 @@ public final class BatteryStatsService extends IBatteryStats.Stub void noteProcessFinish(String name, int uid) { synchronized (mStats) { mStats.noteProcessFinishLocked(name, uid); - StatsLog.write(StatsLog.PROCESS_LIFE_CYCLE_STATE_CHANGED, uid, name, - StatsLog.PROCESS_LIFE_CYCLE_STATE_CHANGED__STATE__FINISHED); + FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_LIFE_CYCLE_STATE_CHANGED, uid, name, + FrameworkStatsLog.PROCESS_LIFE_CYCLE_STATE_CHANGED__STATE__FINISHED); } } /** @param state Process state from ActivityManager.java. */ void noteUidProcessState(int uid, int state) { synchronized (mStats) { - StatsLog.write(StatsLog.UID_PROCESS_STATE_CHANGED, uid, + FrameworkStatsLog.write(FrameworkStatsLog.UID_PROCESS_STATE_CHANGED, uid, ActivityManager.processStateAmToProto(state)); mStats.noteUidProcessStateLocked(uid, state); @@ -453,8 +453,8 @@ public final class BatteryStatsService extends IBatteryStats.Stub enforceCallingPermission(); synchronized (mStats) { mStats.noteSyncStartLocked(name, uid); - StatsLog.write_non_chained(StatsLog.SYNC_STATE_CHANGED, uid, null, name, - StatsLog.SYNC_STATE_CHANGED__STATE__ON); + FrameworkStatsLog.write_non_chained(FrameworkStatsLog.SYNC_STATE_CHANGED, uid, null, + name, FrameworkStatsLog.SYNC_STATE_CHANGED__STATE__ON); } } @@ -462,8 +462,8 @@ public final class BatteryStatsService extends IBatteryStats.Stub enforceCallingPermission(); synchronized (mStats) { mStats.noteSyncFinishLocked(name, uid); - StatsLog.write_non_chained(StatsLog.SYNC_STATE_CHANGED, uid, null, name, - StatsLog.SYNC_STATE_CHANGED__STATE__OFF); + FrameworkStatsLog.write_non_chained(FrameworkStatsLog.SYNC_STATE_CHANGED, uid, null, + name, FrameworkStatsLog.SYNC_STATE_CHANGED__STATE__OFF); } } @@ -472,8 +472,9 @@ public final class BatteryStatsService extends IBatteryStats.Stub enforceCallingPermission(); synchronized (mStats) { mStats.noteJobStartLocked(name, uid); - StatsLog.write_non_chained(StatsLog.SCHEDULED_JOB_STATE_CHANGED, uid, null, - name, StatsLog.SCHEDULED_JOB_STATE_CHANGED__STATE__STARTED, + FrameworkStatsLog.write_non_chained(FrameworkStatsLog.SCHEDULED_JOB_STATE_CHANGED, + uid, null, name, + FrameworkStatsLog.SCHEDULED_JOB_STATE_CHANGED__STATE__STARTED, JobProtoEnums.STOP_REASON_UNKNOWN, standbyBucket, jobid); } } @@ -483,9 +484,10 @@ public final class BatteryStatsService extends IBatteryStats.Stub enforceCallingPermission(); synchronized (mStats) { mStats.noteJobFinishLocked(name, uid, stopReason); - StatsLog.write_non_chained(StatsLog.SCHEDULED_JOB_STATE_CHANGED, uid, null, - name, StatsLog.SCHEDULED_JOB_STATE_CHANGED__STATE__FINISHED, - stopReason, standbyBucket, jobid); + FrameworkStatsLog.write_non_chained(FrameworkStatsLog.SCHEDULED_JOB_STATE_CHANGED, + uid, null, name, + FrameworkStatsLog.SCHEDULED_JOB_STATE_CHANGED__STATE__FINISHED, stopReason, + standbyBucket, jobid); } } @@ -600,8 +602,8 @@ public final class BatteryStatsService extends IBatteryStats.Stub enforceCallingPermission(); synchronized (mStats) { mStats.noteStartSensorLocked(uid, sensor); - StatsLog.write_non_chained(StatsLog.SENSOR_STATE_CHANGED, uid, null, sensor, - StatsLog.SENSOR_STATE_CHANGED__STATE__ON); + FrameworkStatsLog.write_non_chained(FrameworkStatsLog.SENSOR_STATE_CHANGED, uid, null, + sensor, FrameworkStatsLog.SENSOR_STATE_CHANGED__STATE__ON); } } @@ -609,8 +611,8 @@ public final class BatteryStatsService extends IBatteryStats.Stub enforceCallingPermission(); synchronized (mStats) { mStats.noteStopSensorLocked(uid, sensor); - StatsLog.write_non_chained(StatsLog.SENSOR_STATE_CHANGED, uid, null, - sensor, StatsLog.SENSOR_STATE_CHANGED__STATE__OFF); + FrameworkStatsLog.write_non_chained(FrameworkStatsLog.SENSOR_STATE_CHANGED, uid, null, + sensor, FrameworkStatsLog.SENSOR_STATE_CHANGED__STATE__OFF); } } @@ -646,7 +648,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub enforceCallingPermission(); if (DBG) Slog.d(TAG, "begin noteScreenState"); synchronized (mStats) { - StatsLog.write(StatsLog.SCREEN_STATE_CHANGED, state); + FrameworkStatsLog.write(FrameworkStatsLog.SCREEN_STATE_CHANGED, state); mStats.noteScreenStateLocked(state); } @@ -656,7 +658,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub public void noteScreenBrightness(int brightness) { enforceCallingPermission(); synchronized (mStats) { - StatsLog.write(StatsLog.SCREEN_BRIGHTNESS_CHANGED, brightness); + FrameworkStatsLog.write(FrameworkStatsLog.SCREEN_BRIGHTNESS_CHANGED, brightness); mStats.noteScreenBrightnessLocked(brightness); } } @@ -742,8 +744,8 @@ public final class BatteryStatsService extends IBatteryStats.Stub synchronized (mStats) { mStats.noteWifiOnLocked(); } - StatsLog.write(StatsLog.WIFI_ENABLED_STATE_CHANGED, - StatsLog.WIFI_ENABLED_STATE_CHANGED__STATE__ON); + FrameworkStatsLog.write(FrameworkStatsLog.WIFI_ENABLED_STATE_CHANGED, + FrameworkStatsLog.WIFI_ENABLED_STATE_CHANGED__STATE__ON); } public void noteWifiOff() { @@ -751,16 +753,16 @@ public final class BatteryStatsService extends IBatteryStats.Stub synchronized (mStats) { mStats.noteWifiOffLocked(); } - StatsLog.write(StatsLog.WIFI_ENABLED_STATE_CHANGED, - StatsLog.WIFI_ENABLED_STATE_CHANGED__STATE__OFF); + FrameworkStatsLog.write(FrameworkStatsLog.WIFI_ENABLED_STATE_CHANGED, + FrameworkStatsLog.WIFI_ENABLED_STATE_CHANGED__STATE__OFF); } public void noteStartAudio(int uid) { enforceCallingPermission(); synchronized (mStats) { mStats.noteAudioOnLocked(uid); - StatsLog.write_non_chained(StatsLog.AUDIO_STATE_CHANGED, uid, null, - StatsLog.AUDIO_STATE_CHANGED__STATE__ON); + FrameworkStatsLog.write_non_chained(FrameworkStatsLog.AUDIO_STATE_CHANGED, uid, null, + FrameworkStatsLog.AUDIO_STATE_CHANGED__STATE__ON); } } @@ -768,8 +770,8 @@ public final class BatteryStatsService extends IBatteryStats.Stub enforceCallingPermission(); synchronized (mStats) { mStats.noteAudioOffLocked(uid); - StatsLog.write_non_chained(StatsLog.AUDIO_STATE_CHANGED, uid, null, - StatsLog.AUDIO_STATE_CHANGED__STATE__OFF); + FrameworkStatsLog.write_non_chained(FrameworkStatsLog.AUDIO_STATE_CHANGED, uid, null, + FrameworkStatsLog.AUDIO_STATE_CHANGED__STATE__OFF); } } @@ -777,8 +779,8 @@ public final class BatteryStatsService extends IBatteryStats.Stub enforceCallingPermission(); synchronized (mStats) { mStats.noteVideoOnLocked(uid); - StatsLog.write_non_chained(StatsLog.MEDIA_CODEC_STATE_CHANGED, uid, null, - StatsLog.MEDIA_CODEC_STATE_CHANGED__STATE__ON); + FrameworkStatsLog.write_non_chained(FrameworkStatsLog.MEDIA_CODEC_STATE_CHANGED, uid, + null, FrameworkStatsLog.MEDIA_CODEC_STATE_CHANGED__STATE__ON); } } @@ -786,8 +788,8 @@ public final class BatteryStatsService extends IBatteryStats.Stub enforceCallingPermission(); synchronized (mStats) { mStats.noteVideoOffLocked(uid); - StatsLog.write_non_chained(StatsLog.MEDIA_CODEC_STATE_CHANGED, uid, - null, StatsLog.MEDIA_CODEC_STATE_CHANGED__STATE__OFF); + FrameworkStatsLog.write_non_chained(FrameworkStatsLog.MEDIA_CODEC_STATE_CHANGED, uid, + null, FrameworkStatsLog.MEDIA_CODEC_STATE_CHANGED__STATE__OFF); } } @@ -795,8 +797,8 @@ public final class BatteryStatsService extends IBatteryStats.Stub enforceCallingPermission(); synchronized (mStats) { mStats.noteResetAudioLocked(); - StatsLog.write_non_chained(StatsLog.AUDIO_STATE_CHANGED, -1, null, - StatsLog.AUDIO_STATE_CHANGED__STATE__RESET); + FrameworkStatsLog.write_non_chained(FrameworkStatsLog.AUDIO_STATE_CHANGED, -1, null, + FrameworkStatsLog.AUDIO_STATE_CHANGED__STATE__RESET); } } @@ -804,8 +806,8 @@ public final class BatteryStatsService extends IBatteryStats.Stub enforceCallingPermission(); synchronized (mStats) { mStats.noteResetVideoLocked(); - StatsLog.write_non_chained(StatsLog.MEDIA_CODEC_STATE_CHANGED, -1, null, - StatsLog.MEDIA_CODEC_STATE_CHANGED__STATE__RESET); + FrameworkStatsLog.write_non_chained(FrameworkStatsLog.MEDIA_CODEC_STATE_CHANGED, -1, + null, FrameworkStatsLog.MEDIA_CODEC_STATE_CHANGED__STATE__RESET); } } @@ -813,8 +815,8 @@ public final class BatteryStatsService extends IBatteryStats.Stub enforceCallingPermission(); synchronized (mStats) { mStats.noteFlashlightOnLocked(uid); - StatsLog.write_non_chained(StatsLog.FLASHLIGHT_STATE_CHANGED, uid, null, - StatsLog.FLASHLIGHT_STATE_CHANGED__STATE__ON); + FrameworkStatsLog.write_non_chained(FrameworkStatsLog.FLASHLIGHT_STATE_CHANGED, uid, + null, FrameworkStatsLog.FLASHLIGHT_STATE_CHANGED__STATE__ON); } } @@ -822,8 +824,8 @@ public final class BatteryStatsService extends IBatteryStats.Stub enforceCallingPermission(); synchronized (mStats) { mStats.noteFlashlightOffLocked(uid); - StatsLog.write_non_chained(StatsLog.FLASHLIGHT_STATE_CHANGED, uid, null, - StatsLog.FLASHLIGHT_STATE_CHANGED__STATE__OFF); + FrameworkStatsLog.write_non_chained(FrameworkStatsLog.FLASHLIGHT_STATE_CHANGED, uid, + null, FrameworkStatsLog.FLASHLIGHT_STATE_CHANGED__STATE__OFF); } } @@ -832,8 +834,8 @@ public final class BatteryStatsService extends IBatteryStats.Stub if (DBG) Slog.d(TAG, "begin noteStartCamera"); synchronized (mStats) { mStats.noteCameraOnLocked(uid); - StatsLog.write_non_chained(StatsLog.CAMERA_STATE_CHANGED, uid, null, - StatsLog.CAMERA_STATE_CHANGED__STATE__ON); + FrameworkStatsLog.write_non_chained(FrameworkStatsLog.CAMERA_STATE_CHANGED, uid, null, + FrameworkStatsLog.CAMERA_STATE_CHANGED__STATE__ON); } if (DBG) Slog.d(TAG, "end noteStartCamera"); } @@ -842,8 +844,8 @@ public final class BatteryStatsService extends IBatteryStats.Stub enforceCallingPermission(); synchronized (mStats) { mStats.noteCameraOffLocked(uid); - StatsLog.write_non_chained(StatsLog.CAMERA_STATE_CHANGED, uid, null, - StatsLog.CAMERA_STATE_CHANGED__STATE__OFF); + FrameworkStatsLog.write_non_chained(FrameworkStatsLog.CAMERA_STATE_CHANGED, uid, null, + FrameworkStatsLog.CAMERA_STATE_CHANGED__STATE__OFF); } } @@ -851,8 +853,8 @@ public final class BatteryStatsService extends IBatteryStats.Stub enforceCallingPermission(); synchronized (mStats) { mStats.noteResetCameraLocked(); - StatsLog.write_non_chained(StatsLog.CAMERA_STATE_CHANGED, -1, null, - StatsLog.CAMERA_STATE_CHANGED__STATE__RESET); + FrameworkStatsLog.write_non_chained(FrameworkStatsLog.CAMERA_STATE_CHANGED, -1, null, + FrameworkStatsLog.CAMERA_STATE_CHANGED__STATE__RESET); } } @@ -860,8 +862,8 @@ public final class BatteryStatsService extends IBatteryStats.Stub enforceCallingPermission(); synchronized (mStats) { mStats.noteResetFlashlightLocked(); - StatsLog.write_non_chained(StatsLog.FLASHLIGHT_STATE_CHANGED, -1, null, - StatsLog.FLASHLIGHT_STATE_CHANGED__STATE__RESET); + FrameworkStatsLog.write_non_chained(FrameworkStatsLog.FLASHLIGHT_STATE_CHANGED, -1, + null, FrameworkStatsLog.FLASHLIGHT_STATE_CHANGED__STATE__RESET); } } @@ -888,8 +890,8 @@ public final class BatteryStatsService extends IBatteryStats.Stub mStats.noteWifiRunningLocked(ws); } // TODO: Log WIFI_RUNNING_STATE_CHANGED in a better spot to include Hotspot too. - StatsLog.write(StatsLog.WIFI_RUNNING_STATE_CHANGED, - ws, StatsLog.WIFI_RUNNING_STATE_CHANGED__STATE__ON); + FrameworkStatsLog.write(FrameworkStatsLog.WIFI_RUNNING_STATE_CHANGED, + ws, FrameworkStatsLog.WIFI_RUNNING_STATE_CHANGED__STATE__ON); } public void noteWifiRunningChanged(WorkSource oldWs, WorkSource newWs) { @@ -897,10 +899,10 @@ public final class BatteryStatsService extends IBatteryStats.Stub synchronized (mStats) { mStats.noteWifiRunningChangedLocked(oldWs, newWs); } - StatsLog.write(StatsLog.WIFI_RUNNING_STATE_CHANGED, - newWs, StatsLog.WIFI_RUNNING_STATE_CHANGED__STATE__ON); - StatsLog.write(StatsLog.WIFI_RUNNING_STATE_CHANGED, - oldWs, StatsLog.WIFI_RUNNING_STATE_CHANGED__STATE__OFF); + FrameworkStatsLog.write(FrameworkStatsLog.WIFI_RUNNING_STATE_CHANGED, + newWs, FrameworkStatsLog.WIFI_RUNNING_STATE_CHANGED__STATE__ON); + FrameworkStatsLog.write(FrameworkStatsLog.WIFI_RUNNING_STATE_CHANGED, + oldWs, FrameworkStatsLog.WIFI_RUNNING_STATE_CHANGED__STATE__OFF); } public void noteWifiStopped(WorkSource ws) { @@ -908,8 +910,8 @@ public final class BatteryStatsService extends IBatteryStats.Stub synchronized (mStats) { mStats.noteWifiStoppedLocked(ws); } - StatsLog.write(StatsLog.WIFI_RUNNING_STATE_CHANGED, - ws, StatsLog.WIFI_RUNNING_STATE_CHANGED__STATE__OFF); + FrameworkStatsLog.write(FrameworkStatsLog.WIFI_RUNNING_STATE_CHANGED, + ws, FrameworkStatsLog.WIFI_RUNNING_STATE_CHANGED__STATE__OFF); } public void noteWifiState(int wifiState, String accessPoint) { diff --git a/services/core/java/com/android/server/am/BroadcastQueue.java b/services/core/java/com/android/server/am/BroadcastQueue.java index 6fca3f61e670..6697b5ab7c85 100644 --- a/services/core/java/com/android/server/am/BroadcastQueue.java +++ b/services/core/java/com/android/server/am/BroadcastQueue.java @@ -47,10 +47,11 @@ import android.permission.IPermissionManager; import android.util.EventLog; import android.util.Slog; import android.util.SparseIntArray; -import android.util.StatsLog; import android.util.TimeUtils; import android.util.proto.ProtoOutputStream; +import com.android.internal.util.FrameworkStatsLog; + import java.io.FileDescriptor; import java.io.PrintWriter; import java.text.SimpleDateFormat; @@ -1255,8 +1256,8 @@ public final class BroadcastQueue { r.dispatchClockTime = System.currentTimeMillis(); if (mLogLatencyMetrics) { - StatsLog.write( - StatsLog.BROADCAST_DISPATCH_LATENCY_REPORTED, + FrameworkStatsLog.write( + FrameworkStatsLog.BROADCAST_DISPATCH_LATENCY_REPORTED, r.dispatchClockTime - r.enqueueClockTime); } diff --git a/services/core/java/com/android/server/am/CachedAppOptimizer.java b/services/core/java/com/android/server/am/CachedAppOptimizer.java index 6819578d9cdc..313c185a84c6 100644 --- a/services/core/java/com/android/server/am/CachedAppOptimizer.java +++ b/services/core/java/com/android/server/am/CachedAppOptimizer.java @@ -36,10 +36,10 @@ import android.provider.DeviceConfig.Properties; import android.text.TextUtils; import android.util.EventLog; import android.util.Slog; -import android.util.StatsLog; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.util.FrameworkStatsLog; import com.android.server.ServiceThread; import java.io.FileOutputStream; @@ -849,11 +849,11 @@ public final class CachedAppOptimizer { // on every single compaction for a flag that will seldom change and the // impact of reading the wrong value here is low. if (mRandom.nextFloat() < mCompactStatsdSampleRate) { - StatsLog.write(StatsLog.APP_COMPACTED, pid, name, pendingAction, - rssBefore[0], rssBefore[1], rssBefore[2], rssBefore[3], - rssAfter[0], rssAfter[1], rssAfter[2], rssAfter[3], time, - lastCompactAction, lastCompactTime, lastOomAdj, - ActivityManager.processStateAmToProto(procState), + FrameworkStatsLog.write(FrameworkStatsLog.APP_COMPACTED, pid, name, + pendingAction, rssBefore[0], rssBefore[1], rssBefore[2], + rssBefore[3], rssAfter[0], rssAfter[1], rssAfter[2], + rssAfter[3], time, lastCompactAction, lastCompactTime, + lastOomAdj, ActivityManager.processStateAmToProto(procState), zramFreeKbBefore, zramFreeKbAfter); } diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java index 73ca39b22de1..7c36a7e74ac1 100644 --- a/services/core/java/com/android/server/am/ProcessList.java +++ b/services/core/java/com/android/server/am/ProcessList.java @@ -100,7 +100,6 @@ import android.util.Pair; import android.util.Slog; import android.util.SparseArray; import android.util.SparseBooleanArray; -import android.util.StatsLog; import android.view.Display; import com.android.internal.annotations.GuardedBy; @@ -109,6 +108,7 @@ import com.android.internal.app.ProcessMap; import com.android.internal.app.procstats.ProcessStats; import com.android.internal.os.Zygote; import com.android.internal.util.ArrayUtils; +import com.android.internal.util.FrameworkStatsLog; import com.android.internal.util.MemInfoReader; import com.android.server.LocalServices; import com.android.server.ServiceThread; @@ -1473,7 +1473,7 @@ public final class ProcessList { proc.baseProcessTracker.reportCachedKill(proc.pkgList.mPkgList, proc.lastCachedPss); for (int ipkg = proc.pkgList.size() - 1; ipkg >= 0; ipkg--) { ProcessStats.ProcessStateHolder holder = proc.pkgList.valueAt(ipkg); - StatsLog.write(StatsLog.CACHED_KILL_REPORTED, + FrameworkStatsLog.write(FrameworkStatsLog.CACHED_KILL_REPORTED, proc.info.uid, holder.state.getName(), holder.state.getPackage(), @@ -1495,7 +1495,7 @@ public final class ProcessList { proc.lastCachedPss); for (int ipkg = proc.pkgList.size() - 1; ipkg >= 0; ipkg--) { ProcessStats.ProcessStateHolder holder = proc.pkgList.valueAt(ipkg); - StatsLog.write(StatsLog.CACHED_KILL_REPORTED, + FrameworkStatsLog.write(FrameworkStatsLog.CACHED_KILL_REPORTED, proc.info.uid, holder.state.getName(), holder.state.getPackage(), @@ -2640,8 +2640,8 @@ public final class ProcessList { // about the process state of the isolated UID *before* it is registered with the // owning application. mService.mBatteryStatsService.addIsolatedUid(uid, info.uid); - StatsLog.write(StatsLog.ISOLATED_UID_CHANGED, info.uid, uid, - StatsLog.ISOLATED_UID_CHANGED__EVENT__CREATED); + FrameworkStatsLog.write(FrameworkStatsLog.ISOLATED_UID_CHANGED, info.uid, uid, + FrameworkStatsLog.ISOLATED_UID_CHANGED__EVENT__CREATED); } final ProcessRecord r = new ProcessRecord(mService, info, proc, uid); diff --git a/services/core/java/com/android/server/am/ProcessRecord.java b/services/core/java/com/android/server/am/ProcessRecord.java index 1e2dd2deb568..b0c0aaeca75e 100644 --- a/services/core/java/com/android/server/am/ProcessRecord.java +++ b/services/core/java/com/android/server/am/ProcessRecord.java @@ -56,7 +56,6 @@ import android.util.DebugUtils; import android.util.EventLog; import android.util.Slog; import android.util.SparseArray; -import android.util.StatsLog; import android.util.TimeUtils; import android.util.proto.ProtoOutputStream; @@ -66,6 +65,7 @@ import com.android.internal.app.procstats.ProcessStats; import com.android.internal.os.BatteryStatsImpl; import com.android.internal.os.ProcessCpuTracker; import com.android.internal.os.Zygote; +import com.android.internal.util.FrameworkStatsLog; import com.android.server.wm.WindowProcessController; import com.android.server.wm.WindowProcessListener; @@ -646,7 +646,7 @@ class ProcessRecord implements WindowProcessListener { origBase.setState(ProcessStats.STATE_NOTHING, tracker.getMemFactorLocked(), SystemClock.uptimeMillis(), pkgList.mPkgList); for (int ipkg = pkgList.size() - 1; ipkg >= 0; ipkg--) { - StatsLog.write(StatsLog.PROCESS_STATE_CHANGED, + FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_STATE_CHANGED, uid, processName, pkgList.keyAt(ipkg), ActivityManager.processStateAmToProto(ProcessStats.STATE_NOTHING), pkgList.valueAt(ipkg).appVersion); @@ -681,7 +681,7 @@ class ProcessRecord implements WindowProcessListener { origBase.setState(ProcessStats.STATE_NOTHING, tracker.getMemFactorLocked(), SystemClock.uptimeMillis(), pkgList.mPkgList); for (int ipkg = pkgList.size() - 1; ipkg >= 0; ipkg--) { - StatsLog.write(StatsLog.PROCESS_STATE_CHANGED, + FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_STATE_CHANGED, uid, processName, pkgList.keyAt(ipkg), ActivityManager.processStateAmToProto(ProcessStats.STATE_NOTHING), pkgList.valueAt(ipkg).appVersion); @@ -971,7 +971,7 @@ class ProcessRecord implements WindowProcessListener { setCurProcState(newState); setCurRawProcState(newState); for (int ipkg = pkgList.size() - 1; ipkg >= 0; ipkg--) { - StatsLog.write(StatsLog.PROCESS_STATE_CHANGED, + FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_STATE_CHANGED, uid, processName, pkgList.keyAt(ipkg), ActivityManager.processStateAmToProto(mRepProcState), pkgList.valueAt(ipkg).appVersion); @@ -989,7 +989,7 @@ class ProcessRecord implements WindowProcessListener { baseProcessTracker.setState(ProcessStats.STATE_NOTHING, tracker.getMemFactorLocked(), now, pkgList.mPkgList); for (int ipkg = pkgList.size() - 1; ipkg >= 0; ipkg--) { - StatsLog.write(StatsLog.PROCESS_STATE_CHANGED, + FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_STATE_CHANGED, uid, processName, pkgList.keyAt(ipkg), ActivityManager.processStateAmToProto(ProcessStats.STATE_NOTHING), pkgList.valueAt(ipkg).appVersion); @@ -1075,7 +1075,7 @@ class ProcessRecord implements WindowProcessListener { void setReportedProcState(int repProcState) { mRepProcState = repProcState; for (int ipkg = pkgList.size() - 1; ipkg >= 0; ipkg--) { - StatsLog.write(StatsLog.PROCESS_STATE_CHANGED, + FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_STATE_CHANGED, uid, processName, pkgList.keyAt(ipkg), ActivityManager.processStateAmToProto(mRepProcState), pkgList.valueAt(ipkg).appVersion); @@ -1606,16 +1606,16 @@ class ProcessRecord implements WindowProcessListener { Process.sendSignal(pid, Process.SIGNAL_QUIT); } - StatsLog.write(StatsLog.ANR_OCCURRED, uid, processName, + FrameworkStatsLog.write(FrameworkStatsLog.ANR_OCCURRED, uid, processName, activityShortComponentName == null ? "unknown": activityShortComponentName, annotation, (this.info != null) ? (this.info.isInstantApp() - ? StatsLog.ANROCCURRED__IS_INSTANT_APP__TRUE - : StatsLog.ANROCCURRED__IS_INSTANT_APP__FALSE) - : StatsLog.ANROCCURRED__IS_INSTANT_APP__UNAVAILABLE, + ? FrameworkStatsLog.ANROCCURRED__IS_INSTANT_APP__TRUE + : FrameworkStatsLog.ANROCCURRED__IS_INSTANT_APP__FALSE) + : FrameworkStatsLog.ANROCCURRED__IS_INSTANT_APP__UNAVAILABLE, isInterestingToUserLocked() - ? StatsLog.ANROCCURRED__FOREGROUND_STATE__FOREGROUND - : StatsLog.ANROCCURRED__FOREGROUND_STATE__BACKGROUND, + ? FrameworkStatsLog.ANROCCURRED__FOREGROUND_STATE__FOREGROUND + : FrameworkStatsLog.ANROCCURRED__FOREGROUND_STATE__BACKGROUND, getProcessClassEnum(), (this.info != null) ? this.info.packageName : ""); final ProcessRecord parentPr = parentProcess != null |