Merge "Merge "TEMP" am: 844e7e7f6b am: 1888a8a8d1 am: a2ab613738" into sc-dev

2021-05-11 23:43:25 +00:00
parent ddb586c2a6 6f6df9554d
commit 6840df80e1
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",