aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorge Ruesga <jorge@ruesga.com>2013-11-15 02:27:36 +0100
committerJorge Ruesga <jorge@ruesga.com>2013-11-15 02:27:36 +0100
commitce337ecc4fd00ec673a43770e07b6ef96c4542f1 (patch)
treec5f39b08cfe61e54e3ddcd3bf749cd9031542465
parentd60e42f5aaf303449ce7ae6b15bcb1484a4b68cf (diff)
downloadandroid_packages_apps_CMFileManager-ce337ecc4fd00ec673a43770e07b6ef96c4542f1.tar.gz
android_packages_apps_CMFileManager-ce337ecc4fd00ec673a43770e07b6ef96c4542f1.tar.bz2
android_packages_apps_CMFileManager-ce337ecc4fd00ec673a43770e07b6ef96c4542f1.zip
CMFM: Fix deadlock
Change-Id: I564b6510550aead6b6abce694a4720e451aa50f4 JIRA: CYAN-2650 Issue: https://jira.cyanogenmod.org/browse/CYAN-2650 Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
-rw-r--r--src/com/cyanogenmod/filemanager/ui/widgets/NavigationView.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/cyanogenmod/filemanager/ui/widgets/NavigationView.java b/src/com/cyanogenmod/filemanager/ui/widgets/NavigationView.java
index f17c6459..61aa09e5 100644
--- a/src/com/cyanogenmod/filemanager/ui/widgets/NavigationView.java
+++ b/src/com/cyanogenmod/filemanager/ui/widgets/NavigationView.java
@@ -806,6 +806,10 @@ public class NavigationView extends RelativeLayout implements
//Check that it is really necessary change the directory
if (!reload && this.mCurrentDir != null && this.mCurrentDir.compareTo(fNewDir) == 0) {
+ synchronized (this.mSync) {
+ mChangingDir = false;
+ mSync.notify();
+ }
return;
}