summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard/src/com/android
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2014-03-20 16:10:04 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-20 16:10:04 +0000
commit5837a15df189968be7cc0c48dbc91f1fd83885fc (patch)
treefc98525b842ff2c36283d674f797248b892359de /packages/Keyguard/src/com/android
parent9371a03873eb3c7aab5f06ad3c6c5c1e4fc55221 (diff)
parent1d6c2573d4b2824511354d651d7350df327f454f (diff)
downloadframeworks_base-5837a15df189968be7cc0c48dbc91f1fd83885fc.zip
frameworks_base-5837a15df189968be7cc0c48dbc91f1fd83885fc.tar.gz
frameworks_base-5837a15df189968be7cc0c48dbc91f1fd83885fc.tar.bz2
am 1d6c2573: am aebe3b6c: am abde0aaa: am 375ff2c4: am 2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev
* commit '1d6c2573d4b2824511354d651d7350df327f454f': 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 1e79ee4..2e76f19 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java
@@ -1120,6 +1120,7 @@ public class KeyguardHostView extends KeyguardViewBase {
KeyguardWidgetFrame frame = mAppWidgetContainer.getWidgetPageAt(i);
frame.removeAllViews();
}
+ getSecurityContainer().onPause(); // clean up any actions in progress
}
public void goToWidget(int appWidgetId) {