summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard/src
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2014-03-20 01:14:40 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-20 01:14:40 +0000
commitabde0aaa7958976b8f3a66e348d6a5152b0d838e (patch)
tree4a313ba3fc11ba7da725dc787090526c15f96d0a /packages/Keyguard/src
parentca58036dd8018bec81fc5ab9d0376cd35b363125 (diff)
parent375ff2c4a7b42d6dfd333e0ffa351be88fdab034 (diff)
downloadframeworks_base-abde0aaa7958976b8f3a66e348d6a5152b0d838e.zip
frameworks_base-abde0aaa7958976b8f3a66e348d6a5152b0d838e.tar.gz
frameworks_base-abde0aaa7958976b8f3a66e348d6a5152b0d838e.tar.bz2
am 375ff2c4: am 2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev
* commit '375ff2c4a7b42d6dfd333e0ffa351be88fdab034': Attempt to fix a bug where SIM progress dialog gets stuck.
Diffstat (limited to 'packages/Keyguard/src')
-rw-r--r--packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java
index 1bae9b8..3388887 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java
@@ -1655,6 +1655,7 @@ public class KeyguardHostView extends KeyguardViewBase {
KeyguardWidgetFrame frame = mAppWidgetContainer.getWidgetPageAt(i);
frame.removeAllViews();
}
+ getSecurityContainer().onPause(); // clean up any actions in progress
}
/**