commit ec41ca06876587e14fc80fca3539ddfecab7ef44
author Mihai Preda <preda@google.com> Mon Mar 01 11:53:47 2010 +0100
committer Mihai Preda <preda@google.com> Mon Mar 01 11:53:47 2010 +0100
tree bb0aeb14e30377ba75989ab82954c26cda4890df
parent c5b19295774dd0912f31a5652acbef0c5365928e

Calculator: update arity lib to v2.1.2 to fix log.

Bug 2464487.

Android.mk

diff --git a/Android.mk b/Android.mk
index 99e6f55..4008d8c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -31,7 +31,7 @@
 ##################################################
 include $(CLEAR_VARS)
 
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := libarity:arity-2.0.2.jar
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := libarity:arity-2.1.2.jar
 include $(BUILD_MULTI_PREBUILT)
 
 # Use the folloing include to make our test apk.

arity-2.0.2.jar

diff --git a/arity-2.0.2.jar b/arity-2.0.2.jar
deleted file mode 100644
index 7be246d..0000000
--- a/arity-2.0.2.jar
+++ /dev/null
Binary files differ

arity-2.1.2.jar

diff --git a/arity-2.1.2.jar b/arity-2.1.2.jar
new file mode 100644
index 0000000..54c4a98
--- /dev/null
+++ b/arity-2.1.2.jar
Binary files differ

src/com/android/calculator2/Logic.java

diff --git a/src/com/android/calculator2/Logic.java b/src/com/android/calculator2/Logic.java
index bd066de..aab51f7 100644
--- a/src/com/android/calculator2/Logic.java
+++ b/src/com/android/calculator2/Logic.java
@@ -50,13 +50,6 @@
 
     Logic(Context context, History history, CalculatorDisplay display, Button equalButton) {
         mErrorString = context.getResources().getString(R.string.error);
-        try {
-            // in calculator we use log() for base-10,
-            // unlike in arity-lib where log() is natural logarithm
-            mSymbols.define(mSymbols.compileWithName("log(x)=log10(x)"));
-        } catch (SyntaxException e) {
-            throw new Error("" + e); //never
-        }
         mHistory = history;
         mDisplay = display;
         mDisplay.setLogic(this);