diff options
| author | Harshit Mahajan <harshitmahajan@google.com> | 2024-04-09 16:35:24 +0000 |
|---|---|---|
| committer | Harshit Mahajan <harshitmahajan@google.com> | 2024-04-10 15:23:46 +0000 |
| commit | 14e87269e53ffda041a28b6177222ae5c68e8088 (patch) | |
| tree | f29980da22334dcfc57d1e5c281e8c8848749c1a | |
| parent | 64d8d5be146b32c8fb551cf331e3871cadcdc703 (diff) | |
| download | base-14e87269e53ffda041a28b6177222ae5c68e8088.tar.gz | |
[CrashRecovery] Moving the files back
Unable to raise the SystemAPIs from the new place so moving it back.
Bug: 289203818
Test: atest CtsPackageWatchdogTestCases
Change-Id: Ia79f349c1e6addb083b0b5c7cac0276922d7c5db
| -rw-r--r-- | services/core/java/com/android/server/ExplicitHealthCheckController.java (renamed from packages/CrashRecovery/services/java/com/android/server/ExplicitHealthCheckController.java) | 0 | ||||
| -rw-r--r-- | services/core/java/com/android/server/OWNERS | 5 | ||||
| -rw-r--r-- | services/core/java/com/android/server/PackageWatchdog.java (renamed from packages/CrashRecovery/services/java/com/android/server/PackageWatchdog.java) | 0 | ||||
| -rw-r--r-- | services/core/java/com/android/server/RescueParty.java (renamed from packages/CrashRecovery/services/java/com/android/server/RescueParty.java) | 0 | ||||
| -rw-r--r-- | services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java (renamed from packages/CrashRecovery/services/java/com/android/server/rollback/RollbackPackageHealthObserver.java) | 0 | ||||
| -rw-r--r-- | services/core/java/com/android/server/rollback/WatchdogRollbackLogger.java (renamed from packages/CrashRecovery/services/java/com/android/server/rollback/WatchdogRollbackLogger.java) | 0 |
6 files changed, 3 insertions, 2 deletions
diff --git a/packages/CrashRecovery/services/java/com/android/server/ExplicitHealthCheckController.java b/services/core/java/com/android/server/ExplicitHealthCheckController.java index 3d610d3747c9..3d610d3747c9 100644 --- a/packages/CrashRecovery/services/java/com/android/server/ExplicitHealthCheckController.java +++ b/services/core/java/com/android/server/ExplicitHealthCheckController.java diff --git a/services/core/java/com/android/server/OWNERS b/services/core/java/com/android/server/OWNERS index bdc4a7afae89..2545620a2630 100644 --- a/services/core/java/com/android/server/OWNERS +++ b/services/core/java/com/android/server/OWNERS @@ -22,6 +22,7 @@ per-file *AppOp* = file:/core/java/android/permission/OWNERS per-file *Battery* = file:/BATTERY_STATS_OWNERS per-file *BinaryTransparency* = file:/core/java/android/transparency/OWNERS per-file *Binder* = file:/core/java/com/android/internal/os/BINDER_OWNERS +per-file ExplicitHealthCheckController.java = file:/services/core/java/com/android/server/crashrecovery/OWNERS per-file *Gnss* = file:/services/core/java/com/android/server/location/OWNERS per-file **IpSec* = file:/services/core/java/com/android/server/net/OWNERS per-file **IpSec* = file:/services/core/java/com/android/server/vcn/OWNERS @@ -35,9 +36,9 @@ per-file DynamicSystemService.java = file:/packages/DynamicSystemInstallationSer per-file GestureLauncherService.java = file:platform/packages/apps/EmergencyInfo:/OWNERS per-file MmsServiceBroker.java = file:/telephony/OWNERS per-file NetIdManager.java = file:/services/core/java/com/android/server/net/OWNERS -per-file PackageWatchdog.java, RescueParty.java = file:/services/core/java/com/android/server/rollback/OWNERS +per-file PackageWatchdog.java = file:/services/core/java/com/android/server/crashrecovery/OWNERS per-file PinnerService.java = file:/core/java/android/app/pinner/OWNERS -per-file RescueParty.java = shuc@google.com, ancr@google.com, harshitmahajan@google.com +per-file RescueParty.java = file:/services/core/java/com/android/server/crashrecovery/OWNERS per-file SensitiveContentProtectionManagerService.java = file:/core/java/android/permission/OWNERS per-file SystemClockTime.java = file:/services/core/java/com/android/server/timedetector/OWNERS per-file SystemTimeZone.java = file:/services/core/java/com/android/server/timezonedetector/OWNERS diff --git a/packages/CrashRecovery/services/java/com/android/server/PackageWatchdog.java b/services/core/java/com/android/server/PackageWatchdog.java index 6f20adf74ee2..6f20adf74ee2 100644 --- a/packages/CrashRecovery/services/java/com/android/server/PackageWatchdog.java +++ b/services/core/java/com/android/server/PackageWatchdog.java diff --git a/packages/CrashRecovery/services/java/com/android/server/RescueParty.java b/services/core/java/com/android/server/RescueParty.java index 271d552fc574..271d552fc574 100644 --- a/packages/CrashRecovery/services/java/com/android/server/RescueParty.java +++ b/services/core/java/com/android/server/RescueParty.java diff --git a/packages/CrashRecovery/services/java/com/android/server/rollback/RollbackPackageHealthObserver.java b/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java index 93f26aefb692..93f26aefb692 100644 --- a/packages/CrashRecovery/services/java/com/android/server/rollback/RollbackPackageHealthObserver.java +++ b/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java diff --git a/packages/CrashRecovery/services/java/com/android/server/rollback/WatchdogRollbackLogger.java b/services/core/java/com/android/server/rollback/WatchdogRollbackLogger.java index 519c0edfc532..519c0edfc532 100644 --- a/packages/CrashRecovery/services/java/com/android/server/rollback/WatchdogRollbackLogger.java +++ b/services/core/java/com/android/server/rollback/WatchdogRollbackLogger.java |