commit 9eba10e17fd00dba92bc145ee4ea12396cd0ff5e
author Treehugger Robot <treehugger-gerrit@google.com> Fri Nov 08 17:31:42 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 08 17:31:42 2019 +0000
tree d667b3371ca0c7bfdc7e1210027fd89d5b0d8f1b
parent 8893f158c6985c80b4c3122142d9763c74fa22d0
parent df6e4d5c8e3c7920d64661348863979fde924ee6

Merge changes from topic "upstream-hal-v6"

* changes:
  Introduce audio V6
  Watchdog: Add Audio HAL V5.0 to the list of dumped HALs

services/core/java/com/android/server/Watchdog.java

diff --git a/services/core/java/com/android/server/Watchdog.java b/services/core/java/com/android/server/Watchdog.java
index 19ad32e..83ad4e7 100644
--- a/services/core/java/com/android/server/Watchdog.java
+++ b/services/core/java/com/android/server/Watchdog.java
@@ -103,6 +103,8 @@
     public static final List<String> HAL_INTERFACES_OF_INTEREST = Arrays.asList(
             "android.hardware.audio@2.0::IDevicesFactory",
             "android.hardware.audio@4.0::IDevicesFactory",
+            "android.hardware.audio@5.0::IDevicesFactory",
+            "android.hardware.audio@6.0::IDevicesFactory",
             "android.hardware.biometrics.face@1.0::IBiometricsFace",
             "android.hardware.bluetooth@1.0::IBluetoothHci",
             "android.hardware.camera.provider@2.4::ICameraProvider",