aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Birg <roman@cyngn.com>2015-08-24 09:42:47 -0700
committerStephen Bird <sbird@cyngn.com>2015-08-26 14:21:07 -0700
commit450f3d55f9428817d5a2dd41aa9717d620ddf955 (patch)
tree95e37560b4a22491283fdec0a79062fe1164717b
parent8895e1c38bacdbe320ab84a5a7db3dc0e0c4fffb (diff)
downloadandroid_packages_apps_CMFileManager-450f3d55f9428817d5a2dd41aa9717d620ddf955.tar.gz
android_packages_apps_CMFileManager-450f3d55f9428817d5a2dd41aa9717d620ddf955.tar.bz2
android_packages_apps_CMFileManager-450f3d55f9428817d5a2dd41aa9717d620ddf955.zip
CMFM: don't apply search filter when search hasn't started
Otherwise it can lead to crashes with short searches Ref: QRDL-950 Change-Id: Icf555435b4cc7107db328c757633a29ffacd62c5 Signed-off-by: Roman Birg <roman@cyngn.com>
-rwxr-xr-xsrc/com/cyanogenmod/filemanager/activities/SearchActivity.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/cyanogenmod/filemanager/activities/SearchActivity.java b/src/com/cyanogenmod/filemanager/activities/SearchActivity.java
index bbf716a9..e87c63c1 100755
--- a/src/com/cyanogenmod/filemanager/activities/SearchActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/SearchActivity.java
@@ -1518,7 +1518,9 @@ public class SearchActivity extends Activity
@Override
public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
- new SearchResultFilterTask().execute(MimeTypeHelper.MimeTypeCategory.values()[i]);
+ if (mResultList != null && !mResultList.isEmpty()) {
+ new SearchResultFilterTask().execute(MimeTypeHelper.MimeTypeCategory.values()[i]);
+ }
}
@Override