commit b3f237c8a8c67b819f946a0aa6a9b9b625a32c39
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 30 23:59:00 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 30 23:59:00 2020 +0000
tree 19561d2106f533ffb0e58ba193fac58b2e973bd8
parent 2f5ce9939db85872bac6598acef33b34c9da4ff6
parent a3c549fe9cfe65b18b27491508196a4626390fee

Merge "Fixed bug in APC rate limiting fix." am: a3c549fe9c

Change-Id: I80195a6c87be2e2f67fdea7ad608c92369e9dcda

keystore/confirmation_manager.cpp

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();