commit 2880ff3e6262d95c6167e076f9efe15e1a5fe3dd
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 07 01:01:22 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 07 01:01:22 2020 +0000
tree f09d565f5cd1b01d5ad5c7e27d1056d8644287af
parent c7c1f08fde0ac3b0d52138522ab8347adeb3213c
parent 7938852374f2424825c17f15180ab2458b27a8b1

Merge "adbd_auth: dispatch pending prompts on success." am: 089d083f77 am: 74d9d05b92 am: 7938852374

Change-Id: I1488891d9c43e391e31187c20d8a14cead5b4955

libs/adbd_auth/adbd_auth.cpp

diff --git a/libs/adbd_auth/adbd_auth.cpp b/libs/adbd_auth/adbd_auth.cpp
index 6479109..a9c2311 100644
--- a/libs/adbd_auth/adbd_auth.cpp
+++ b/libs/adbd_auth/adbd_auth.cpp
@@ -178,6 +178,10 @@
 
           this->callbacks_.key_authorized(arg, id);
           this->dispatched_prompt_ = std::nullopt;
+
+          // We need to dispatch pending prompts here upon success as well,
+          // since we might have multiple queued prompts.
+          DispatchPendingPrompt();
         } else if (packet[0] == 'N' && packet[1] == 'O') {
           CHECK_EQ(2UL, packet.length());
           // TODO: Do we want a callback if the key is denied?