diff options
| author | Michael Bestas <mikeioannina@gmail.com> | 2016-12-30 21:49:12 +0200 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2016-12-30 22:01:00 +0200 |
| commit | e04ba51b69a0e2424b4eabce699e70cef0499d7d (patch) | |
| tree | 8cf46aa895224ee260e3567a6adf35c305d201c3 | |
| parent | 886d52508f6e62d5cc27917353c644adf15f8569 (diff) | |
| download | android_packages_apps_UnifiedEmail-e04ba51b69a0e2424b4eabce699e70cef0499d7d.tar.gz android_packages_apps_UnifiedEmail-e04ba51b69a0e2424b4eabce699e70cef0499d7d.tar.bz2 android_packages_apps_UnifiedEmail-e04ba51b69a0e2424b4eabce699e70cef0499d7d.zip | |
Revert "UnifiedEmail: exit search will crash NPE."
This reverts commit 31e09729acae86fb54ab0195ccc44ee5fc075e65.
| -rwxr-xr-x | src/com/android/mail/ui/AbstractActivityController.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java index 569b0e945..fc1fdebcc 100755 --- a/src/com/android/mail/ui/AbstractActivityController.java +++ b/src/com/android/mail/ui/AbstractActivityController.java @@ -4554,9 +4554,7 @@ public abstract class AbstractActivityController implements ActivityController, @Override public void exitLocalSearch() { - if (mFolder != null) { - mFolder.type = mFolderType; - } + mFolder.type = mFolderType; if (getConversationListFragment() != null) { getConversationListFragment().exitSeachView(); } |