Fixed bug in APC rate limiting fix.
Cancelling an APC request from the app side must lead to a callback to
unblock the caller.
Bug: 138655142
Bug: 148411844
Test: atest confirmationui_invocation_test
Change-Id: If71ffc7d3d75dde6f0217ccdb003569149947ec8
diff --git a/keystore/confirmation_manager.cpp b/keystore/confirmation_manager.cpp
index c6ae1a0..76df1cc 100644
--- a/keystore/confirmation_manager.cpp
+++ b/keystore/confirmation_manager.cpp
@@ -125,15 +125,7 @@
void ConfirmationManager::cancelPrompt() {
mMutex.lock();
mRateLimiting.cancelPrompt();
- if (mCurrentListener != nullptr) {
- mCurrentListener->unlinkToDeath(mDeathRecipient);
- mCurrentListener = nullptr;
- }
sp<IConfirmationUI> confirmationUI = mCurrentConfirmationUI;
- if (mCurrentConfirmationUI != nullptr) {
- mCurrentConfirmationUI->unlinkToDeath(this);
- mCurrentConfirmationUI = nullptr;
- }
mMutex.unlock();
if (confirmationUI != nullptr) {
confirmationUI->abort();