commit e1e70c57613956dff0f14829f6385e26c323b609
author Jeff Hamilton <jham@android.com> Sun Jan 23 19:17:22 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Sun Jan 23 19:17:22 2011 -0800
tree c3eccf164f827267cae9bf5515c9777fc6b5fd4d
parent 42a461570b9c5502959e429c4f16ca5ca860c4f2
parent 9f20cd7ff26548e98d7b8412807720c7b340133d

Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread

core/java/com/android/internal/widget/DigitalClock.java

diff --git a/core/java/com/android/internal/widget/DigitalClock.java b/core/java/com/android/internal/widget/DigitalClock.java
index 303a1bf..7289751 100644
--- a/core/java/com/android/internal/widget/DigitalClock.java
+++ b/core/java/com/android/internal/widget/DigitalClock.java
@@ -80,7 +80,11 @@
                     }
                 });
             } else {
-                mContext.unregisterReceiver(this);
+                try {
+                    mContext.unregisterReceiver(this);
+                } catch (RuntimeException e) {
+                    // Shouldn't happen
+                }
             }
         }
     };
@@ -124,7 +128,11 @@
                 digitalClock.setDateFormat();
                 digitalClock.updateTime();
             } else {
-                mContext.getContentResolver().unregisterContentObserver(this);
+                try {
+                    mContext.getContentResolver().unregisterContentObserver(this);
+                } catch (RuntimeException e) {
+                    // Shouldn't happen
+                }
             }
         }
     }