summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2023-12-07 18:33:19 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-12-07 18:33:19 +0000
commit70aff51936c65bddd88b622d19f921c1e38c53e9 (patch)
tree498b9587bbf50210990b2afcdb1c505f59306100
parent85c8ac51562201698b8fcf273963a0dff7cc972c (diff)
parent657bc29a5d72476df96adbb1cc3687d033af2c4d (diff)
Merge "ANR WatchDog += servicemanager" into main am: 657bc29a5d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2858165 Change-Id: I879091a8672b1900dba39c2ed714adc9a160f7f3 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 a81bba816b4c..df86c5e65d48 100644
--- a/services/core/java/com/android/server/Watchdog.java
+++ b/services/core/java/com/android/server/Watchdog.java
@@ -120,6 +120,7 @@ public class Watchdog implements Dumpable {
"/system/bin/mediaserver",
"/system/bin/netd",
"/system/bin/sdcard",
+ "/system/bin/servicemanager",
"/system/bin/surfaceflinger",
"/system/bin/vold",
"media.extractor", // system/bin/mediaextractor