summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHans Boehm <hboehm@google.com>2015-10-11 16:46:19 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-10-11 16:46:19 +0000
commitc07e2616582e85e859ddf77cfb0378b99199ffc7 (patch)
treed85cc9eb8daaa461e35fd7894b8c2c389258d157 /src
parent1e05c8a241fdbaed1ad6a5a9a9582ec6e50b6a19 (diff)
parent6cccee27f07ad3cf8ba5d221afd8bfd4a867b573 (diff)
downloadandroid_packages_apps_ExactCalculator-c07e2616582e85e859ddf77cfb0378b99199ffc7.tar.gz
android_packages_apps_ExactCalculator-c07e2616582e85e859ddf77cfb0378b99199ffc7.tar.bz2
android_packages_apps_ExactCalculator-c07e2616582e85e859ddf77cfb0378b99199ffc7.zip
am 6cccee27: Merge "Fix factorial(0)" into mnc-dr-dev
* commit '6cccee27f07ad3cf8ba5d221afd8bfd4a867b573': Fix factorial(0)
Diffstat (limited to 'src')
-rw-r--r--src/com/android/calculator2/BoundedRational.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/calculator2/BoundedRational.java b/src/com/android/calculator2/BoundedRational.java
index 9d3e2a7..dc132f6 100644
--- a/src/com/android/calculator2/BoundedRational.java
+++ b/src/com/android/calculator2/BoundedRational.java
@@ -555,6 +555,9 @@ public class BoundedRational {
}
return prod1.multiply(prod2);
} else {
+ if (n == 0) {
+ return BigInteger.ONE;
+ }
BigInteger res = BigInteger.valueOf(n);
for (long i = n - step; i > 1; i -= step) {
res = res.multiply(BigInteger.valueOf(i));