Correctly track Activity in Evaluator
Bug: 33703223
Evaluator was remembering the Activity with which it had been
created, not necessarily the current one. This interfered with
proper display of things like timeout messages that rely on the
remembered Activity.
Use the Application rather than Activity context for the DB helper,
since it outlives the Activity.
Remove unused mActivity from ExpressionDB.
Also acouple of trivial cleanups for minor annoyances found while
debugging:
1. Add some missing final declarations.
2. Fix a comment.
Change-Id: Iefe1fb588f66a1c77c82164680306377917c07af
diff --git a/src/com/android/calculator2/ExpressionDB.java b/src/com/android/calculator2/ExpressionDB.java
index e1c2d2f..47d6813 100644
--- a/src/com/android/calculator2/ExpressionDB.java
+++ b/src/com/android/calculator2/ExpressionDB.java
@@ -205,11 +205,8 @@
// initialization.
private Object mLock = new Object();
- private Activity mActivity;
-
- public ExpressionDB(Activity activity) {
- mActivity = activity;
- mExpressionDBHelper = new ExpressionDBHelper(activity);
+ public ExpressionDB(Context context) {
+ mExpressionDBHelper = new ExpressionDBHelper(context);
AsyncInitializer initializer = new AsyncInitializer();
// All calls that create background database accesses are made from the UI thread, and
// use a SERIAL_EXECUTOR. Thus they execute in order.