Skip to content

Commit ec41ca0

Browse files
author
Mihai Preda
committed
Calculator: update arity lib to v2.1.2 to fix log.
Bug 2464487.
1 parent c5b1929 commit ec41ca0

File tree

4 files changed

+1
-8
lines changed

4 files changed

+1
-8
lines changed

Diff for: Android.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ include $(BUILD_PACKAGE)
3131
##################################################
3232
include $(CLEAR_VARS)
3333

34-
LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := libarity:arity-2.0.2.jar
34+
LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := libarity:arity-2.1.2.jar
3535
include $(BUILD_MULTI_PREBUILT)
3636

3737
# Use the folloing include to make our test apk.

Diff for: arity-2.0.2.jar

-49.2 KB
Binary file not shown.

Diff for: arity-2.1.2.jar

52.7 KB
Binary file not shown.

Diff for: src/com/android/calculator2/Logic.java

-7
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,6 @@ class Logic {
5050

5151
Logic(Context context, History history, CalculatorDisplay display, Button equalButton) {
5252
mErrorString = context.getResources().getString(R.string.error);
53-
try {
54-
// in calculator we use log() for base-10,
55-
// unlike in arity-lib where log() is natural logarithm
56-
mSymbols.define(mSymbols.compileWithName("log(x)=log10(x)"));
57-
} catch (SyntaxException e) {
58-
throw new Error("" + e); //never
59-
}
6053
mHistory = history;
6154
mDisplay = display;
6255
mDisplay.setLogic(this);

0 commit comments

Comments
 (0)