commit 0f5969bb0a885abb5ee1829bcb91627cb61b1509
author Robert Shih <robertshih@google.com> Fri Jul 02 18:08:13 2021 -0700
committer Robert Shih <robertshih@google.com> Tue Jul 13 18:17:23 2021 -0700
tree 5d625b49c56167d8419a89d8f3d09e74fef0562a
parent 52a8c1e6e206861d46c26d58379d599274737d1e

DrmManager: check drm.service.enabled in init (2nd attempt)

Bug: 170678524
Test: atest DRMTest#testForwardLockAccess
Change-Id: I79021b946f4721a87569f3e6cd46b5ae66f120a5

drm/drmserver/drmserver.rc

diff --git a/drm/drmserver/drmserver.rc b/drm/drmserver/drmserver.rc
index de46fb9..eb176c1 100644
--- a/drm/drmserver/drmserver.rc
+++ b/drm/drmserver/drmserver.rc
@@ -1,5 +1,12 @@
 service drm /system/bin/drmserver
+    disabled
     class main
     user drm
     group drm system inet drmrpc readproc
     writepid /dev/cpuset/foreground/tasks
+
+on property:drm.service.enabled=true
+    start drm
+
+on property:drm.service.enabled=1
+    start drm