Only reset encryption when a device disconnects.
Encryption was being reset too early. Specifically, it was reset but
there still needed to be an ACK message sent to the car. This was
throwing an exception.
Now, just rely on device disconnection to reset encryption. Otherwise,
while the device is connected, it should still be able to send messages.
Test: Verify that sending the ACK after unlock completed does not throw
exception.
Bug: 135931998
Change-Id: I0aa338769c73219e0c7fa3eb5e4e4e552a0d4a55
diff --git a/service/src/com/android/car/trust/CarTrustAgentUnlockService.java b/service/src/com/android/car/trust/CarTrustAgentUnlockService.java
index ba342dc..2523845 100644
--- a/service/src/com/android/car/trust/CarTrustAgentUnlockService.java
+++ b/service/src/com/android/car/trust/CarTrustAgentUnlockService.java
@@ -532,8 +532,6 @@
mTrustedDeviceService.getUserHandleByTokenHandle(Utils.bytesToLong(handle)),
phoneCredentials.getEscrowToken().toByteArray(),
Utils.bytesToLong(handle));
-
- resetEncryptionState();
}
/**