commit 1fd3dbe7642d04de3a98c87341229ef8f0bd146d
author Daniel Norman <danielnorman@google.com> Wed Jul 31 15:41:20 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jul 31 15:41:20 2019 -0700
tree 10b0e15f27756c7f046669f7f4702a2a82bd1ee4
parent 09db36645cdac7a6c0a70bdb81bc2f599f50ec7b
parent 3a6c4696bd9df96a7b92fe207a80d5111a38fcf2

Merge "Replaces 'oneshot' and 'interface' with 'onrestart restart audioserver'." am: 5bb99e24ad
am: 3a6c4696bd

Change-Id: Id599ba9fe2eda07569204956730d0ec78b4272f4

audio/common/all-versions/default/service/android.hardware.audio@2.0-service.rc

diff --git a/audio/common/all-versions/default/service/android.hardware.audio@2.0-service.rc b/audio/common/all-versions/default/service/android.hardware.audio@2.0-service.rc
index 6e91bcc..72b4d19 100644
--- a/audio/common/all-versions/default/service/android.hardware.audio@2.0-service.rc
+++ b/audio/common/all-versions/default/service/android.hardware.audio@2.0-service.rc
@@ -6,9 +6,4 @@
     capabilities BLOCK_SUSPEND
     ioprio rt 4
     writepid /dev/cpuset/foreground/tasks /dev/stune/foreground/tasks
-    # audioflinger restarts itself when it loses connection with the hal
-    # and its .rc file has an "onrestart restart audio-hal" rule, thus
-    # an additional auto-restart from the init process isn't needed.
-    oneshot
-    interface android.hardware.audio@4.0::IDevicesFactory default
-    interface android.hardware.audio@2.0::IDevicesFactory default
+    onrestart restart audioserver