summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2014-03-20 01:08:43 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-20 01:08:43 +0000
commit375ff2c4a7b42d6dfd333e0ffa351be88fdab034 (patch)
tree1cd987f87027ba7cd099f058c7066d9d684614f1
parentcfd46dc4847d5ef1ed14484717cf857ae5f67cae (diff)
parent2598fbd71a2109ab307d32935a13fa1eab150e8d (diff)
downloadframeworks_base-375ff2c4a7b42d6dfd333e0ffa351be88fdab034.zip
frameworks_base-375ff2c4a7b42d6dfd333e0ffa351be88fdab034.tar.gz
frameworks_base-375ff2c4a7b42d6dfd333e0ffa351be88fdab034.tar.bz2
am 2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev
* commit '2598fbd71a2109ab307d32935a13fa1eab150e8d': Attempt to fix a bug where SIM progress dialog gets stuck.
-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
}
/**