From ec55bbd8e22335f8481530d1421a1df397add577 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Mon, 4 Apr 2022 17:33:26 +0000 Subject: [PATCH 1/4] Implement getInterfaceHash/Version (health) As these interfaces get frozen, java services implementing the interfaces are required to implement getInterfaceHash and getInterfaceVersion [1] [1] https://source.android.com/devices/architecture/aidl/stable-aidl#new-meta-interface-methods Bug: 190577319 Test: m Change-Id: I01dda85890dae59082067e4b38c0f50d493cd22d --- .../com/android/server/health/HealthRegCallbackAidl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/services/core/java/com/android/server/health/HealthRegCallbackAidl.java b/services/core/java/com/android/server/health/HealthRegCallbackAidl.java index 629011a86bb40..90a2f480643de 100644 --- a/services/core/java/com/android/server/health/HealthRegCallbackAidl.java +++ b/services/core/java/com/android/server/health/HealthRegCallbackAidl.java @@ -115,5 +115,13 @@ public class HealthRegCallbackAidl { public void healthInfoChanged(HealthInfo healthInfo) throws RemoteException { mServiceInfoCallback.update(healthInfo); } + @Override + public String getInterfaceHash() { + return IHealthInfoCallback.HASH; + } + @Override + public int getInterfaceVersion() { + return IHealthInfoCallback.VERSION; + } } } From df1fa99b0198d2629de388fe7916366e70de19cc Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Mon, 4 Apr 2022 17:10:48 +0000 Subject: [PATCH 2/4] Implement getInterfaceHash/Version (omapi) As these interfaces get frozen for TM, java services implementing the interfaces are required to implement getInterfaceHash and getInterfaceVersion [1] [1] https://source.android.com/devices/architecture/aidl/stable-aidl#new-meta-interface-methods Bug: 190577319 Test: m Change-Id: I274f847ed8156acd0c4b288e306fcab2d380bcd5 --- omapi/java/android/se/omapi/SEService.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/omapi/java/android/se/omapi/SEService.java b/omapi/java/android/se/omapi/SEService.java index f42ca364b6d9e..306c09afeaebb 100644 --- a/omapi/java/android/se/omapi/SEService.java +++ b/omapi/java/android/se/omapi/SEService.java @@ -118,6 +118,16 @@ public final class SEService { }); } } + + @Override + public String getInterfaceHash() { + return ISecureElementListener.HASH; + } + + @Override + public int getInterfaceVersion() { + return ISecureElementListener.VERSION; + } } private SEListener mSEListener = new SEListener(); From ff46eb6627e83641b7554096b2d5175c2239ac6a Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Mon, 4 Apr 2022 22:08:37 +0000 Subject: [PATCH 3/4] Implement getInterfaceHash/Version (CHRE) As these interfaces get frozen, java services implementing the interfaces are required to implement getInterfaceHash and getInterfaceVersion [1] [1] https://source.android.com/devices/architecture/aidl/stable-aidl#new-meta-interface-methods Bug: 190577319 Test: m Change-Id: I009330ca16d68593f26785e81afb11d7752b0c20 --- .../server/location/contexthub/IContextHubWrapper.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/services/core/java/com/android/server/location/contexthub/IContextHubWrapper.java b/services/core/java/com/android/server/location/contexthub/IContextHubWrapper.java index a1ee46b4c9433..acc0746764c57 100644 --- a/services/core/java/com/android/server/location/contexthub/IContextHubWrapper.java +++ b/services/core/java/com/android/server/location/contexthub/IContextHubWrapper.java @@ -389,6 +389,15 @@ public abstract class IContextHubWrapper { mCallback.handleTransactionResult(transactionId, success); }); } + @Override + public String getInterfaceHash() { + return android.hardware.contexthub.IContextHubCallback.HASH; + } + + @Override + public int getInterfaceVersion() { + return android.hardware.contexthub.IContextHubCallback.VERSION; + } } ContextHubWrapperAidl(android.hardware.contexthub.IContextHub hub) { From 1b46333208bdcdd2164d61fface3866dfed6e316 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Mon, 4 Apr 2022 22:11:35 +0000 Subject: [PATCH 4/4] Implement getInterfaceHash/Version (USB) As these interfaces get frozen, java services implementing the interfaces are required to implement getInterfaceHash and getInterfaceVersion [1] [1] https://source.android.com/devices/architecture/aidl/stable-aidl#new-meta-interface-methods Bug: 190577319 Test: m Change-Id: I00ced32a26fd1af7bc8cc23749d92ae90d5a5a0f --- .../com/android/server/usb/hal/port/UsbPortAidl.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/services/usb/java/com/android/server/usb/hal/port/UsbPortAidl.java b/services/usb/java/com/android/server/usb/hal/port/UsbPortAidl.java index 600fc27f51032..94273a37abcdb 100644 --- a/services/usb/java/com/android/server/usb/hal/port/UsbPortAidl.java +++ b/services/usb/java/com/android/server/usb/hal/port/UsbPortAidl.java @@ -725,5 +725,15 @@ public final class UsbPortAidl implements UsbPortHal { e); } } + + @Override + public String getInterfaceHash() { + return IUsbCallback.HASH; + } + + @Override + public int getInterfaceVersion() { + return IUsbCallback.VERSION; + } } }