diff options
| author | Annie Chin <afchin@google.com> | 2017-01-30 18:18:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-01-30 18:18:33 +0000 |
| commit | be39140d6932be25a4a1d62b8a9ea83c4e731cb0 (patch) | |
| tree | 5ab702cf1305df11dfcb60ec5e0c8ba4abc5d641 | |
| parent | f36ce9239ec10168727ed9b2769ddcf91882fcbd (diff) | |
| parent | 1838cf7da0b9ca5f245f7747fc4253d06ca79852 (diff) | |
| download | android_packages_apps_ExactCalculator-be39140d6932be25a4a1d62b8a9ea83c4e731cb0.tar.gz android_packages_apps_ExactCalculator-be39140d6932be25a4a1d62b8a9ea83c4e731cb0.tar.bz2 android_packages_apps_ExactCalculator-be39140d6932be25a4a1d62b8a9ea83c4e731cb0.zip | |
Merge "Null-check mEvaluator onDestroy()" into ub-calculator-euler
| -rw-r--r-- | src/com/android/calculator2/HistoryFragment.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/calculator2/HistoryFragment.java b/src/com/android/calculator2/HistoryFragment.java index 64a94f9..e2c0974 100644 --- a/src/com/android/calculator2/HistoryFragment.java +++ b/src/com/android/calculator2/HistoryFragment.java @@ -176,9 +176,11 @@ public class HistoryFragment extends Fragment implements DragLayout.DragCallback mDragLayout.removeDragCallback(this); } - // Note that the view is destroyed when the fragment backstack is popped, so - // these are essentially called when the DragLayout is closed. - mEvaluator.cancelNonMain(); + if (mEvaluator != null) { + // Note that the view is destroyed when the fragment backstack is popped, so + // these are essentially called when the DragLayout is closed. + mEvaluator.cancelNonMain(); + } } private void initializeController(boolean isResult, boolean isOneLine) { |