Null-check result string.

Bug: 34801142
Change-Id: I1c464ea92c1a7698c81e515159173f6284d127de

1 files changed, 3 insertions, 1 deletions

diff --git a/src/com/android/calculator2/Evaluator.java b/src/com/android/calculator2/Evaluator.java
index ea6d8ff..472cd34 100644
--- a/src/com/android/calculator2/Evaluator.java
+++ b/src/com/android/calculator2/Evaluator.java
@@ -1531,7 +1531,9 @@ public class Evaluator implements CalculatorExpr.ExprResolver {
         final String rs = ei.mResultString;
         // An error can occur here only under extremely unlikely conditions.
         // Check anyway, and just refuse.
-        if (ei.mResultString == ERRONEOUS_RESULT) {
+        // rs *should* never be null, but it happens. Check as a workaround to protect against
+        // crashes until we find the root cause (b/34801142)
+        if (rs == ERRONEOUS_RESULT || rs == null) {
             return null;
         }
         final int dotIndex = rs.indexOf('.');