From cab8148a753a04172c87bafd3d84ec3f59d7f795 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Mon, 4 Apr 2022 17:33:26 +0000 Subject: [PATCH 1/2] 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 Merged-In: I01dda85890dae59082067e4b38c0f50d493cd22d 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 bfc79c8f602867225eee17c92fc801a00e054a9a Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Mon, 4 Apr 2022 17:10:48 +0000 Subject: [PATCH 2/2] 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 Merged-In: 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();