commit 8ca75a65d6a473538ab694c3381fc266ff6e744e
author Wenting Zhai <wentingzhai@google.com> Mon Jun 24 20:23:20 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jun 24 20:23:20 2019 -0700
tree d0580ab7232271f01ed2bdf2448b80e8ede3ed5d
parent e70b23a7c7b7afe6371d6b96867827d2fb7e2817
parent 6b033c2da5f83774b75d51ea9a2b8159d478410e

Merge "Move handle sending code down to end of function" into qt-dev am: 965d479a9e
am: 6b033c2da5

Change-Id: I1d12d9a540458ed8bcddb3c2b3a3100eb67a51de

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

diff --git a/service/src/com/android/car/trust/CarTrustAgentEnrollmentService.java b/service/src/com/android/car/trust/CarTrustAgentEnrollmentService.java
index 1b5f4ab..0f54647 100644
--- a/service/src/com/android/car/trust/CarTrustAgentEnrollmentService.java
+++ b/service/src/com/android/car/trust/CarTrustAgentEnrollmentService.java
@@ -465,9 +465,6 @@
             clientDeviceName = mRemoteEnrollmentDevice.getName();
         } else if (mClientDeviceName != null) {
             clientDeviceName = mClientDeviceName;
-            mCarTrustAgentBleManager.sendEnrollmentMessage(mRemoteEnrollmentDevice,
-                    mEncryptionKey.encryptData(Utils.longToBytes(handle)),
-                    OperationType.CLIENT_MESSAGE, /* isPayloadEncrypted= */ true);
         } else {
             clientDeviceName = mContext.getString(R.string.trust_device_default_name);
         }
@@ -513,6 +510,9 @@
             Log.d(TAG, "Sending handle: " + handle);
         }
         mHandle = handle;
+        mCarTrustAgentBleManager.sendEnrollmentMessage(mRemoteEnrollmentDevice,
+                mEncryptionKey.encryptData(Utils.longToBytes(handle)),
+                OperationType.CLIENT_MESSAGE, /* isPayloadEncrypted= */ true);
     }
 
     void onEnrollmentAdvertiseStartSuccess() {