Merge "TEMP" am: 844e7e7f6b am: 1888a8a8d1 am: a2ab613738

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699609 Change-Id: I2a10e5d8b0c5496bf7e4ce93aab8fbd4d0568e99
2021-05-11 23:43:11 +00:00
parent 7a1e137d0d a2ab613738
commit 6f6df9554d
1 changed files with 1 additions and 0 deletions
--- a/services/core/java/com/android/server/Watchdog.java
+++ b/services/core/java/com/android/server/Watchdog.java
@@ -97,6 +97,7 @@ public class Watchdog {
        "/system/bin/audioserver",
        "/system/bin/cameraserver",
        "/system/bin/drmserver",
+        "/system/bin/keystore2",
        "/system/bin/mediadrmserver",
        "/system/bin/mediaserver",
        "/system/bin/netd",