[CMFileManager] Fix "File Manager isn't responding..." pops up after tapping "Secure...

Procedures
1.Go to “File Manager”.
2.Press "Menu" icon on upper left corner,and then tap "Secure storage".
3.Select "CANCEL" when the note "Create storage" pops up.
4.Repeat Step2 again,check the phone

Have no response when pressing "Secure storage",wait about 10-20s,the note "File Manager isn't responding..." pops up.

Change-Id: I8ce4b55002d6fc34f89c4a59404469e7f3637cbc

diff --git a/src/com/cyanogenmod/filemanager/console/secure/SecureStorageKeyPromptDialog.java b/src/com/cyanogenmod/filemanager/console/secure/SecureStorageKeyPromptDialog.java
old mode 100644 (file)
new mode 100755 (executable)
index 257e95a..b3363e3
--- a/src/com/cyanogenmod/filemanager/console/secure/SecureStorageKeyPromptDialog.java
+++ b/src/com/cyanogenmod/filemanager/console/secure/SecureStorageKeyPromptDialog.java
@@ -158,6 +158,11 @@ public class SecureStorageKeyPromptDialog
                 public void onDismiss(DialogInterface dialog) {
                     mDialog.dismiss();
                     finish();
+
+                    // Unlock the wait
+                    synchronized (WAIT_SYNC) {
+                        WAIT_SYNC.notify();
+                    }
                 }
             });
             mDialog.setOnCancelListener(new OnCancelListener() {
@@ -166,6 +171,11 @@ public class SecureStorageKeyPromptDialog
                     sUnlockKeyTemp = null;
                     mDialog.cancel();
                     finish();
+
+                    // Unlock the wait
+                    synchronized (WAIT_SYNC) {
+                        WAIT_SYNC.notify();
+                    }
                 }
             });
             mDialog.setCanceledOnTouchOutside(false);
@@ -184,16 +194,6 @@ public class SecureStorageKeyPromptDialog
         }
 
         @Override
-        protected void onDestroy() {
-            super.onDestroy();
-
-            // Unlock the wait
-            synchronized (WAIT_SYNC) {
-                WAIT_SYNC.notify();
-            }
-        }
-
-        @Override
         public void onClick(DialogInterface dialog, int which) {
             switch (which) {
                 case DialogInterface.BUTTON_POSITIVE: