commit e81a070127e18addb7e3e88421755da9552d1074
author Yuxing Yao <yaoyx@google.com> Thu Dec 05 22:37:42 2019 +0000
committer Yuxing Yao <yaoyx@google.com> Thu Dec 05 22:37:42 2019 +0000
tree fa9b5df1cdb69ce61eb3d673428ec47b2d2f23ec
parent 84fdc240d4a4c36c9bce5d6b38351d748e7b69c0

Revert "Send server auth as ENCRYPTION_HANDSHAKE message."

This reverts commit 84fdc240d4a4c36c9bce5d6b38351d748e7b69c0.

Reason for revert: per b/145764386, we have decided to keep the same behavior for TrustAgent in car/service. This issue will be dealt by phone side library.

Change-Id: If0cc664003a9754abf7b259fae982b28ffc4b2b3

service/src/com/android/car/trust/CarTrustAgentUnlockService.java

diff --git a/service/src/com/android/car/trust/CarTrustAgentUnlockService.java b/service/src/com/android/car/trust/CarTrustAgentUnlockService.java
index 37feff5..f270d80 100644
--- a/service/src/com/android/car/trust/CarTrustAgentUnlockService.java
+++ b/service/src/com/android/car/trust/CarTrustAgentUnlockService.java
@@ -421,7 +421,7 @@
     private void sendServerAuthToClient(byte[] resumeBytes) {
         // send to client
         mCarTrustAgentBleManager.sendMessage(resumeBytes,
-                OperationType.ENCRYPTION_HANDSHAKE, /* isPayloadEncrypted= */ false,
+                OperationType.CLIENT_MESSAGE, /* isPayloadEncrypted= */false,
                 mSendMessageCallback);
     }