summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard/src/com/android
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2014-03-20 15:47:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-20 15:47:31 +0000
commitaebe3b6ca49f232bb0c8733256407680bb56b6cb (patch)
tree83b3e0d1d60ff2a27df78ef9818f8058d0b606a3 /packages/Keyguard/src/com/android
parent1e0ae4fa4b23edd5e3015d23845f2aa9050a0435 (diff)
parentabde0aaa7958976b8f3a66e348d6a5152b0d838e (diff)
downloadframeworks_base-aebe3b6ca49f232bb0c8733256407680bb56b6cb.zip
frameworks_base-aebe3b6ca49f232bb0c8733256407680bb56b6cb.tar.gz
frameworks_base-aebe3b6ca49f232bb0c8733256407680bb56b6cb.tar.bz2
am abde0aaa: am 375ff2c4: am 2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev
* commit 'abde0aaa7958976b8f3a66e348d6a5152b0d838e': Attempt to fix a bug where SIM progress dialog gets stuck.
Diffstat (limited to 'packages/Keyguard/src/com/android')
-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
}
/**