diff options
| author | Josh Gao <jmgao@google.com> | 2020-01-06 16:32:44 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2020-01-06 16:32:44 -0800 |
| commit | 74d9d05b92d0141a47439b07646e6d7c51290ae0 (patch) | |
| tree | 78add0077e8ee8413820b846a15125eaef893618 | |
| parent | 6458a892dc44c1d3af1bc48aaab99dd79ad1dc32 (diff) | |
| parent | 089d083f77935ca658361dcfa6303ec8740dea0a (diff) | |
| download | native-tmp_b_147314974.tar.gz | |
Merge "adbd_auth: dispatch pending prompts on success."tmp_b_147314974
am: 089d083f77
Change-Id: I75ecbef0917e693a4a12826dd61159486a9ce6fd
| -rw-r--r-- | libs/adbd_auth/adbd_auth.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/adbd_auth/adbd_auth.cpp b/libs/adbd_auth/adbd_auth.cpp index 64791098ee..a9c23110c9 100644 --- a/libs/adbd_auth/adbd_auth.cpp +++ b/libs/adbd_auth/adbd_auth.cpp @@ -178,6 +178,10 @@ public: 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? |