Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4f12fe2 authored by Ben Miles's avatar Ben Miles
Browse files

Move CriticalEventLog to its own package 

Bug: 200263868
Test: atest CriticalEventLogTest
Change-Id: I0e42a8519280fcd658514ee3003b8e870716441e
parent df08d493

proto/src/critical_event_log.proto→proto/src/criticalevents/critical_event_log.proto

+1 −1
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@ 
 */

 */





syntax = "proto2";

syntax = "proto2";

package com.android.server.am;

package com.android.server.criticalevents;





option java_multiple_files = true;

option java_multiple_files = true;

services/core/java/com/android/server/Watchdog.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -45,8 +45,8 @@ import com.android.internal.os.ProcessCpuTracker; 
import com.android.internal.os.ZygoteConnectionConstants;

import com.android.internal.os.ZygoteConnectionConstants;

import com.android.internal.util.FrameworkStatsLog;

import com.android.internal.util.FrameworkStatsLog;

import com.android.server.am.ActivityManagerService;

import com.android.server.am.ActivityManagerService;

import com.android.server.am.CriticalEventLog;

import com.android.server.am.TraceErrorLogger;

import com.android.server.am.TraceErrorLogger;

import com.android.server.criticalevents.CriticalEventLog;

import com.android.server.wm.SurfaceAnimationThread;

import com.android.server.wm.SurfaceAnimationThread;





import java.io.BufferedReader;

import java.io.BufferedReader;

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -382,6 +382,7 @@ import com.android.server.am.LowMemDetector.MemFactor; 
import com.android.server.appop.AppOpsService;

import com.android.server.appop.AppOpsService;

import com.android.server.compat.PlatformCompat;

import com.android.server.compat.PlatformCompat;

import com.android.server.contentcapture.ContentCaptureManagerInternal;

import com.android.server.contentcapture.ContentCaptureManagerInternal;

import com.android.server.criticalevents.CriticalEventLog;

import com.android.server.firewall.IntentFirewall;

import com.android.server.firewall.IntentFirewall;

import com.android.server.graphics.fonts.FontManagerInternal;

import com.android.server.graphics.fonts.FontManagerInternal;

import com.android.server.job.JobSchedulerInternal;

import com.android.server.job.JobSchedulerInternal;

services/core/java/com/android/server/am/ProcessErrorStateRecord.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -49,6 +49,7 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.os.ProcessCpuTracker;

import com.android.internal.os.ProcessCpuTracker;

import com.android.internal.util.FrameworkStatsLog;

import com.android.internal.util.FrameworkStatsLog;

import com.android.server.MemoryPressureUtil;

import com.android.server.MemoryPressureUtil;

import com.android.server.criticalevents.CriticalEventLog;

import com.android.server.wm.WindowProcessController;

import com.android.server.wm.WindowProcessController;





import java.io.File;

import java.io.File;

services/core/java/com/android/server/am/CriticalEventLog.java→services/core/java/com/android/server/criticalevents/CriticalEventLog.java

+6 −6
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 * limitations under the License.

 */

 */





package com.android.server.am;

package com.android.server.criticalevents;





import android.os.Handler;

import android.os.Handler;

import android.os.HandlerThread;

import android.os.HandlerThread;
@@ -23,11 +23,11 @@ import android.util.Slog; 
import com.android.framework.protobuf.nano.MessageNanoPrinter;

import com.android.framework.protobuf.nano.MessageNanoPrinter;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.RingBuffer;

import com.android.internal.util.RingBuffer;

import com.android.server.am.nano.CriticalEventLogProto;

import com.android.server.criticalevents.nano.CriticalEventLogProto;

import com.android.server.am.nano.CriticalEventLogStorageProto;

import com.android.server.criticalevents.nano.CriticalEventLogStorageProto;

import com.android.server.am.nano.CriticalEventProto;

import com.android.server.criticalevents.nano.CriticalEventProto;

import com.android.server.am.nano.CriticalEventProto.HalfWatchdog;

import com.android.server.criticalevents.nano.CriticalEventProto.HalfWatchdog;

import com.android.server.am.nano.CriticalEventProto.Watchdog;

import com.android.server.criticalevents.nano.CriticalEventProto.Watchdog;





import java.io.File;

import java.io.File;

import java.io.FileOutputStream;

import java.io.FileOutputStream;