| commit | 64d1cdb9eae90d6386264ea00f62d8d1f8db4f2b | [log] [tgz] |
|---|---|---|
| author | Hans Boehm <hboehm@google.com> | Tue Mar 08 19:14:07 2016 -0800 |
| committer | Hans Boehm <hboehm@google.com> | Wed Mar 09 10:17:19 2016 -0800 |
| tree | 227e7b9d58eac98a514ae0f1179a32f45911bc83 | |
| parent | b92bc63edc0d19a6d55d1cf6739718eab705ce51 [diff] [blame] |
Correctly handle parenthesized percent expressions Bug: 27496478 A right parenthesis can legitimately follow a +n% expressions without changing its meaning. Change-Id: Id6507ee54c82ba22379f28f0a8c32466ef4a7ca7
diff --git a/src/com/android/calculator2/CalculatorExpr.java b/src/com/android/calculator2/CalculatorExpr.java index 59c800e..f8011e5 100644 --- a/src/com/android/calculator2/CalculatorExpr.java +++ b/src/com/android/calculator2/CalculatorExpr.java
@@ -1055,7 +1055,7 @@ return false; } Operator op = (Operator) mExpr.get(pos + 2); - return op.id == R.id.op_add || op.id == R.id.op_sub; + return op.id == R.id.op_add || op.id == R.id.op_sub || op.id == R.id.rparen; } /**