commit 045beab1d46df52fe7597ec7e27ec787beef5f67
author shiwan <shiwan@codeaurora.org> Thu Dec 01 16:46:20 2016 +0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Dec 01 00:55:41 2016 -0800
tree a87c08a4d737ec9a296e0b93cf7a72542a8e59b0
parent 58db9e521ed810423650043f42fce1e46fe6ebcb

UnifiedEmail: when run monkey will crash by NPE

search feature:
get the NPE in the API setDisableInSearch() of  ConversationListFragment.java
add NPE protect.

Change-Id: Ib993313cd2b76d50f84705a2a210771970f1cf1d
CRs-Fixed: 1096060

src/com/android/mail/ui/ConversationListFragment.java

diff --git a/src/com/android/mail/ui/ConversationListFragment.java b/src/com/android/mail/ui/ConversationListFragment.java
index e7d8cc8..ac65202 100644
--- a/src/com/android/mail/ui/ConversationListFragment.java
+++ b/src/com/android/mail/ui/ConversationListFragment.java
@@ -1421,10 +1421,11 @@
     }
 
     private void setDisableInSearch() {
-        boolean isLocalSearch = ((ActivityController) mActivity.getAccountController())
-                != null ? ((ActivityController) mActivity
-                        .getAccountController()).getCurrentConversationListContext()
-                        .isLocalSearchExecuted() : false;
+        ActivityController controller = (ActivityController) mActivity.getAccountController();
+        boolean isLocalSearch = false;
+        if (controller != null && controller.getCurrentConversationListContext() != null) {
+            isLocalSearch = controller.getCurrentConversationListContext().isLocalSearchExecuted();
+        }
         if (mFolder != null && mFolder.type == FolderType.SEARCH && isLocalSearch) {
             saveFleetingView();
             mSwipeRefreshWidget.setEnabled(false);