commit 8b7e1af6eee7aaa676a5a40335820a8a9068802f
author Kevin Rocard <krocard@google.com> Fri Nov 08 09:51:27 2019 -0800
committer android-build-merger <android-build-merger@google.com> Fri Nov 08 09:51:27 2019 -0800
tree 7d6581d468a90724886266fae0e69fe927e44700
parent ae6fa514a8ed084f081bb3d24c63cbc472502e3b
parent 82d6654ade066f8c3e3018fb7e1fc82c96604a74

Merge changes from topic "upstream-hal-v6"
am: 82d6654ade

Change-Id: Id139d689d7afb0aa0c23501cd771060b2f87b677

media/audioserver/audioserver.rc

diff --git a/media/audioserver/audioserver.rc b/media/audioserver/audioserver.rc
index 3f3ef69..5484613 100644
--- a/media/audioserver/audioserver.rc
+++ b/media/audioserver/audioserver.rc
@@ -6,10 +6,10 @@
     capabilities BLOCK_SUSPEND
     ioprio rt 4
     writepid /dev/cpuset/foreground/tasks /dev/stune/foreground/tasks
-    onrestart restart vendor.audio-hal-2-0
+    onrestart restart vendor.audio-hal
     onrestart restart vendor.audio-hal-4-0-msd
-    # Keep the original service name for backward compatibility when upgrading
-    # O-MR1 devices with framework-only.
+    # Keep the original service names for backward compatibility
+    onrestart restart vendor.audio-hal-2-0
     onrestart restart audio-hal-2-0
 
 on property:vts.native_server.on=1