summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jiakai Zhang <jiakaiz@google.com> 2023-12-15 16:32:33 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-12-15 16:32:33 +0000
commitc6fcff702887c165da4db678ebafc8d823e70417 (patch)
tree52bda8c7298a7db027f16f1c47f035a3297500a6
parent1f511393be786fee12d8a07861b36ad9007e482a (diff)
parentd6227e3c24c57535f00b012adba77cafce75b958 (diff)
Merge "ANR WatchDog += artd." into main am: 1335a83293 am: d6227e3c24
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2870574 Change-Id: I3238e62868be535d2b9e079a20e884dbd20e97c4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/Watchdog.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/Watchdog.java b/services/core/java/com/android/server/Watchdog.java
index df86c5e65d48..f95d6ea117ef 100644
--- a/services/core/java/com/android/server/Watchdog.java
+++ b/services/core/java/com/android/server/Watchdog.java
@@ -129,6 +129,7 @@ public class Watchdog implements Dumpable {
"media.swcodec", // /apex/com.android.media.swcodec/bin/mediaswcodec
"media.transcoding", // Media transcoding service
"com.android.bluetooth", // Bluetooth service
+ "/apex/com.android.art/bin/artd", // ART daemon
"/apex/com.android.os.statsd/bin/statsd", // Stats daemon
};