Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

Bug 2464487.
  • Loading branch information...
commit ec41ca06876587e14fc80fca3539ddfecab7ef44 1 parent c5b1929
Mihai Preda authored
View
2  Android.mk
@@ -31,7 +31,7 @@ include $(BUILD_PACKAGE)
##################################################
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.
View
BIN  arity-2.0.2.jar
Binary file not shown
View
BIN  arity-2.1.2.jar
Binary file not shown
View
7 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);
Please sign in to comment.
Something went wrong with that request. Please try again.