aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkai.cao <kai.cao@ck-telecom.com>2015-04-21 15:21:01 +0800
committerGerrit Code Review <gerrit@cyanogenmod.org>2015-04-22 00:16:40 +0000
commitebd0462a7320bf093d0209cfbbfa290df28cee69 (patch)
tree1298676524559d7eab1a753ce9bd793965ff1e00
parent411c731b38559b1e76e795f3140ad8c19d471be1 (diff)
downloadandroid_packages_apps_CMFileManager-ebd0462a7320bf093d0209cfbbfa290df28cee69.tar.gz
android_packages_apps_CMFileManager-ebd0462a7320bf093d0209cfbbfa290df28cee69.tar.bz2
android_packages_apps_CMFileManager-ebd0462a7320bf093d0209cfbbfa290df28cee69.zip
[CMFileManager] Fix "File Manager isn't responding..." pops up after tapping "Secure storage" in File Manager
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
-rwxr-xr-x[-rw-r--r--]src/com/cyanogenmod/filemanager/console/secure/SecureStorageKeyPromptDialog.java20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/com/cyanogenmod/filemanager/console/secure/SecureStorageKeyPromptDialog.java b/src/com/cyanogenmod/filemanager/console/secure/SecureStorageKeyPromptDialog.java
index 257e95a7..b3363e3a 100644..100755
--- 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: