From 1b46333208bdcdd2164d61fface3866dfed6e316 Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Mon, 4 Apr 2022 22:11:35 +0000
Subject: [PATCH] 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;
+        }
     }
 }