| commit | 1888a8a8d112e3c37b5a67b2fb0c2c2a087a9efa | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Tue May 11 23:02:38 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 11 23:02:38 2021 +0000 |
| tree | a0575725094a22b54e82272880fb0d94789a271d | |
| parent | dd8fa96c017f7b3b52022cae946ae80c1d334079 [diff] | |
| parent | 844e7e7f6b60047da704a5c4ad8405757c7b0157 [diff] |
Merge "TEMP" am: 844e7e7f6b Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699609 Change-Id: I9d7dc437a3695eeb117fafa8b82422c7db2e9c38
diff --git a/services/core/java/com/android/server/Watchdog.java b/services/core/java/com/android/server/Watchdog.java index a37115d..2e38278 100644 --- a/services/core/java/com/android/server/Watchdog.java +++ b/services/core/java/com/android/server/Watchdog.java
@@ -96,6 +96,7 @@ "/system/bin/audioserver", "/system/bin/cameraserver", "/system/bin/drmserver", + "/system/bin/keystore2", "/system/bin/mediadrmserver", "/system/bin/mediaserver", "/system/bin/netd",