diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-12-15 14:57:40 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-15 14:57:40 -0800 |
| commit | 507ea24b8f881f8af42393a0512c88cf7397edb9 (patch) | |
| tree | 9f56421e7fcf452d9ca31816db700fd7fecb7d0f /policy | |
| parent | 17a890729e430503c7a906073dbde570da34c377 (diff) | |
| parent | ffdc7aed5ec8f38706ddfad02d3df05493351083 (diff) | |
| download | frameworks_base-507ea24b8f881f8af42393a0512c88cf7397edb9.zip frameworks_base-507ea24b8f881f8af42393a0512c88cf7397edb9.tar.gz frameworks_base-507ea24b8f881f8af42393a0512c88cf7397edb9.tar.bz2 | |
am ffdc7aed: Merge "avoid crashing system serer process"
* commit 'ffdc7aed5ec8f38706ddfad02d3df05493351083':
avoid crashing system serer process
Diffstat (limited to 'policy')
| -rwxr-xr-x[-rw-r--r--] | policy/src/com/android/internal/policy/impl/GlobalActions.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/GlobalActions.java b/policy/src/com/android/internal/policy/impl/GlobalActions.java index d1f8ef1..3dc77d4 100644..100755 --- a/policy/src/com/android/internal/policy/impl/GlobalActions.java +++ b/policy/src/com/android/internal/policy/impl/GlobalActions.java @@ -408,7 +408,12 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac /** {@inheritDoc} */ public void onDismiss(DialogInterface dialog) { if (SHOW_SILENT_TOGGLE) { - mContext.unregisterReceiver(mRingerModeReceiver); + try { + mContext.unregisterReceiver(mRingerModeReceiver); + } catch (IllegalArgumentException ie) { + // ignore this + Log.w(TAG, ie); + } } } |