commit 5d8961e75685674f46ca376ea8ea13ce02dd292b
author Amith Yamasani <yamasani@google.com> Sat Dec 15 15:10:30 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Sat Dec 15 15:10:30 2012 -0800
tree 0708f29a4d65549846ff60fb913d26daac0a654d
parent 7a3d56e1214bb36dee7ef85678c893d01587216f
parent 507ea24b8f881f8af42393a0512c88cf7397edb9

am 507ea24b: am ffdc7aed: Merge "avoid crashing system serer process"

* commit '507ea24b8f881f8af42393a0512c88cf7397edb9':
  avoid crashing system serer process

policy/src/com/android/internal/policy/impl/GlobalActions.java

diff --git a/policy/src/com/android/internal/policy/impl/GlobalActions.java b/policy/src/com/android/internal/policy/impl/GlobalActions.java
old mode 100644
new mode 100755
index d1f8ef1..3dc77d4
--- a/policy/src/com/android/internal/policy/impl/GlobalActions.java
+++ b/policy/src/com/android/internal/policy/impl/GlobalActions.java
@@ -408,7 +408,12 @@
     /** {@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);
+            }
         }
     }