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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699609 Change-Id: I026fcaa690636c69fb02cd11fedb06801945f711
2021-05-11 23:17:26 +00:00
parent fde2ef0250 1888a8a8d1
commit a2ab613738
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
@@ -96,6 +96,7 @@ public class Watchdog extends Thread {
        "/system/bin/audioserver",
        "/system/bin/cameraserver",
        "/system/bin/drmserver",
+        "/system/bin/keystore2",
        "/system/bin/mediadrmserver",
        "/system/bin/mediaserver",
        "/system/bin/netd",