Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64921be0 authored by Hans Boehm's avatar Hans Boehm
Browse files

Don't call suppressCancelMessage() on wrong class 

Bug: 33580318

Evaluator.cancel needs to check that the evaluator is not an
AsyncReevaluator before calling suppressCancelMessage.

Change-Id: I379fdebcc7e14aff894b2b4d3fcc7553f8dc2fe3
parent 74f5e59e

src/com/android/calculator2/Evaluator.java

+1 −1
Original line number Diff line number Diff line
@@ -1228,7 +1228,7 @@ public class Evaluator implements CalculatorExpr.ExprResolver { 
     */

    private boolean cancel(ExprInfo expr, boolean quiet) {

        if (expr.mEvaluator != null) {

            if (quiet) {

            if (quiet && (expr.mEvaluator instanceof AsyncEvaluator)) {

                ((AsyncEvaluator)(expr.mEvaluator)).suppressCancelMessage();

            }

            // Reevaluation in progress.