summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Moreland <smoreland@google.com>2022-04-13 10:43:50 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-13 10:43:50 +0000
commit74ff7a8dfd0b5765b08db14811a3a6571713add3 (patch)
treeaf813a20e0885d7023918091b9340b82ec24af54
parentb21987545dd981b45bcac9a7decc22c2dcef4265 (diff)
parent86d8e7a7c07ed8beea17d0c54ead7c22681b0d32 (diff)
downloadSecureElement-74ff7a8dfd0b5765b08db14811a3a6571713add3.tar.gz
Implement getInterfaceHash/Version am: 017f4e6780 am: 86d8e7a7c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/17574997 Change-Id: I4c89ee14ca130d1d11929e74e3c528bac5492fde Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-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 d3efb11..20ae533 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 =
@@ -488,6 +498,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;
+ }
}
}