Merge "Fixed bug in APC rate limiting fix."

This commit is contained in:
Treehugger Robot 2020-01-30 23:48:18 +00:00 committed by Gerrit Code Review
commit a3c549fe9c

View file

@ -125,15 +125,7 @@ Status ConfirmationManager::cancelConfirmationPrompt(const sp<IBinder>& listener
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();