diff options
author | Jim Miller <jaggies@google.com> | 2014-03-20 09:19:51 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-20 09:19:51 -0700 |
commit | dc7eb89920af6ca691668a2b50c0b4b956cc03d1 (patch) | |
tree | 504f45cd2bf6390d289bba55fe9ca2f47a038c27 /packages/Keyguard | |
parent | 500367add0c68dc3eba1c09ea098b10020b053d3 (diff) | |
parent | 5837a15df189968be7cc0c48dbc91f1fd83885fc (diff) | |
download | frameworks_base-dc7eb89920af6ca691668a2b50c0b4b956cc03d1.zip frameworks_base-dc7eb89920af6ca691668a2b50c0b4b956cc03d1.tar.gz frameworks_base-dc7eb89920af6ca691668a2b50c0b4b956cc03d1.tar.bz2 |
am 5837a15d: 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 '5837a15df189968be7cc0c48dbc91f1fd83885fc':
Attempt to fix a bug where SIM progress dialog gets stuck.
Diffstat (limited to 'packages/Keyguard')
-rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java | 1 |
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) { |