summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Moreland <smoreland@google.com>2022-04-04 17:19:59 +0000
committerSteven Moreland <smoreland@google.com>2022-04-12 17:32:04 +0000
commited4f8f5df00a53818cf91549cf32aac34d4b49a6 (patch)
tree736c9b297f203e87509ae63a2fc2188610fa6a61
parenta595f9753f5a2f563e4fabc3b60c5bf10db153df (diff)
downloadSecureElement-ed4f8f5df00a53818cf91549cf32aac34d4b49a6.tar.gz
Implement getInterfaceHash/Version
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: I1d9a6fd7a67feb95ab1a4f3a7f5f83bb8e6f9c9f Change-Id: I1d9a6fd7a67feb95ab1a4f3a7f5f83bb8e6f9c9f (cherry picked from commit 017f4e6780628a4c58bb1e08e4429efb91d77150)
-rwxr-xr-xsrc/com/android/se/Channel.java10
-rw-r--r--src/com/android/se/SecureElementService.java20
-rw-r--r--src/com/android/se/Terminal.java10
3 files changed, 40 insertions, 0 deletions
diff --git a/src/com/android/se/Channel.java b/src/com/android/se/Channel.java
index 33327ed..73622fc 100755
--- a/src/com/android/se/Channel.java
+++ b/src/com/android/se/Channel.java
@@ -330,5 +330,15 @@ public class Channel implements IBinder.DeathRecipient {
throw new ServiceSpecificException(SEService.IO_ERROR, e.getMessage());
}
}
+
+ @Override
+ public String getInterfaceHash() {
+ return ISecureElementChannel.HASH;
+ }
+
+ @Override
+ public int getInterfaceVersion() {
+ return ISecureElementChannel.VERSION;
+ }
}
}
diff --git a/src/com/android/se/SecureElementService.java b/src/com/android/se/SecureElementService.java
index b03a462..92b3b51 100644
--- a/src/com/android/se/SecureElementService.java
+++ b/src/com/android/se/SecureElementService.java
@@ -152,6 +152,16 @@ public final class SecureElementService extends Service {
terminal.dump(writer);
}
}
+
+ @Override
+ public String getInterfaceHash() {
+ return ISecureElementService.HASH;
+ }
+
+ @Override
+ public int getInterfaceVersion() {
+ return ISecureElementService.VERSION;
+ }
}
private final ISecureElementService.Stub mSecureElementServiceBinder =
@@ -487,6 +497,16 @@ public final class SecureElementService extends Service {
}
return channel.new SecureElementChannel();
}
+
+ @Override
+ public String getInterfaceHash() {
+ return ISecureElementSession.HASH;
+ }
+
+ @Override
+ public int getInterfaceVersion() {
+ return ISecureElementSession.VERSION;
+ }
}
private final BroadcastReceiver mMultiSimConfigChangedReceiver = new BroadcastReceiver() {
diff --git a/src/com/android/se/Terminal.java b/src/com/android/se/Terminal.java
index 1c055a0..d338cf8 100644
--- a/src/com/android/se/Terminal.java
+++ b/src/com/android/se/Terminal.java
@@ -995,5 +995,15 @@ public class Terminal {
public boolean reset() {
return Terminal.this.reset();
}
+
+ @Override
+ public String getInterfaceHash() {
+ return ISecureElementReader.HASH;
+ }
+
+ @Override
+ public int getInterfaceVersion() {
+ return ISecureElementReader.VERSION;
+ }
}
}