diff options
| author | Hans Boehm <hboehm@google.com> | 2016-12-13 20:48:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-13 20:48:51 +0000 |
| commit | ba7369ab5c9764a1d45ab8dcefefb228a633f58f (patch) | |
| tree | 1be5bb1b66676f08796e1567b4c4af9924ccf8b7 | |
| parent | b699be3e113254b03b7b8cb3c6cd721f61cd0c7a (diff) | |
| parent | 03b3451e0080996b77752c91e4de82e7dc443c02 (diff) | |
| download | android_packages_apps_ExactCalculator-ba7369ab5c9764a1d45ab8dcefefb228a633f58f.tar.gz android_packages_apps_ExactCalculator-ba7369ab5c9764a1d45ab8dcefefb228a633f58f.tar.bz2 android_packages_apps_ExactCalculator-ba7369ab5c9764a1d45ab8dcefefb228a633f58f.zip | |
Merge "Only set erroneous result of "required" evaluations." into ub-calculator-euler
| -rw-r--r-- | src/com/android/calculator2/Evaluator.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/calculator2/Evaluator.java b/src/com/android/calculator2/Evaluator.java index 6827626..a90f5ab 100644 --- a/src/com/android/calculator2/Evaluator.java +++ b/src/com/android/calculator2/Evaluator.java @@ -267,7 +267,7 @@ public class Evaluator implements CalculatorExpr.ExprResolver { public static final int INVALID_MSD = Integer.MAX_VALUE; - // Used to represent an error result. Not displayed. + // Used to represent an erroneous result or a required evaluation. Not displayed. public static final String ERRONEOUS_RESULT = "ERR"; /** @@ -616,7 +616,9 @@ public class Evaluator implements CalculatorExpr.ExprResolver { } mListener.onCancelled(mIndex); } else { - mExprInfo.mResultString = ERRONEOUS_RESULT; + if (mRequired) { + mExprInfo.mResultString = ERRONEOUS_RESULT; + } mListener.onError(mIndex, result.errorResourceId); } return; |