diff options
| author | Michael Bestas <mikeioannina@gmail.com> | 2016-12-30 21:49:52 +0200 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2016-12-30 22:01:00 +0200 |
| commit | 886d52508f6e62d5cc27917353c644adf15f8569 (patch) | |
| tree | b95df73110af29cc6f19436bcb0e2ab8da9a2271 | |
| parent | e75982b2eafd09c1e284a6d47475db909d5427e0 (diff) | |
| download | android_packages_apps_UnifiedEmail-886d52508f6e62d5cc27917353c644adf15f8569.tar.gz android_packages_apps_UnifiedEmail-886d52508f6e62d5cc27917353c644adf15f8569.tar.bz2 android_packages_apps_UnifiedEmail-886d52508f6e62d5cc27917353c644adf15f8569.zip | |
Revert "UnifiedEmail: when run monkey will crash by NPE"
This reverts commit 20ec274a0e67a04c8b7aa3279df9893c0918cb05.
Change-Id: Ic012caa0ba3e1d3ad79bdb0bfb4a53a37417865a
| -rw-r--r-- | src/com/android/mail/ui/ConversationListFragment.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/com/android/mail/ui/ConversationListFragment.java b/src/com/android/mail/ui/ConversationListFragment.java index ac65202e4..e7d8cc82b 100644 --- a/src/com/android/mail/ui/ConversationListFragment.java +++ b/src/com/android/mail/ui/ConversationListFragment.java @@ -1421,11 +1421,10 @@ public final class ConversationListFragment extends Fragment implements } private void setDisableInSearch() { - ActivityController controller = (ActivityController) mActivity.getAccountController(); - boolean isLocalSearch = false; - if (controller != null && controller.getCurrentConversationListContext() != null) { - isLocalSearch = controller.getCurrentConversationListContext().isLocalSearchExecuted(); - } + boolean isLocalSearch = ((ActivityController) mActivity.getAccountController()) + != null ? ((ActivityController) mActivity + .getAccountController()).getCurrentConversationListContext() + .isLocalSearchExecuted() : false; if (mFolder != null && mFolder.type == FolderType.SEARCH && isLocalSearch) { saveFleetingView(); mSwipeRefreshWidget.setEnabled(false); |