Merge changes from topic "upstream-hal-v6"

am: 82d6654ade Change-Id: Id139d689d7afb0aa0c23501cd771060b2f87b677
5 years ago · 8b7e1af6ee
parent ae6fa514a8 82d6654ade
commit 8b7e1af6ee
1 changed files with 3 additions and 3 deletions
--- a/media/audioserver/audioserver.rc
+++ b/media/audioserver/audioserver.rc
@ -6,10 +6,10 @@ service audioserver /system/bin/audioserver
    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