From 174f60059519080696e6e719cdb8c11fb9e47782 Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Wed, 23 Mar 2022 19:49:53 +0900
Subject: [PATCH] Implement getInterfaceHash/Version for SoundTrigger

As the soundtrigger AIDL interface gets frozen for TM, java services
implementing the interface are required to implement getInterfaceHash
and getInterfaceVersion [1].

[1] https://source.android.com/devices/architecture/aidl/stable-aidl#new-meta-interface-methods

Bug: 225941299
Test: m
Change-Id: I5a7568cc081e6820b2041bc7ac34d1b0b4ff6009
---
 .../SoundTriggerHw3Compat.java                | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerHw3Compat.java b/services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerHw3Compat.java
index 0a085ba4265f7..ebe0ff85167d9 100644
--- a/services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerHw3Compat.java
+++ b/services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerHw3Compat.java
@@ -206,6 +206,16 @@ public class SoundTriggerHw3Compat implements ISoundTriggerHal {
         public void onResourcesAvailable() {
             mDelegate.onResourcesAvailable();
         }
+
+        @Override
+        public int getInterfaceVersion() {
+            return ISoundTriggerHwGlobalCallback.VERSION;
+        }
+
+        @Override
+        public String getInterfaceHash() {
+            return ISoundTriggerHwGlobalCallback.HASH;
+        }
     }
 
     private static class ModelCallbackAdaper extends ISoundTriggerHwCallback.Stub {
@@ -233,5 +243,15 @@ public class SoundTriggerHw3Compat implements ISoundTriggerHal {
             event.recognitionStillActive |= event.status == RecognitionStatus.FORCED;
             mDelegate.recognitionCallback(model, event);
         }
+
+        @Override
+        public int getInterfaceVersion() {
+            return ISoundTriggerHwCallback.VERSION;
+        }
+
+        @Override
+        public String getInterfaceHash() {
+            return ISoundTriggerHwCallback.HASH;
+        }
     }
 }