commit 42a461570b9c5502959e429c4f16ca5ca860c4f2
author Jim Miller <jaggies@google.com> Sun Jan 23 13:40:31 2011 -0800
committer Jim Miller <jaggies@google.com> Sun Jan 23 13:40:31 2011 -0800
tree 1a96984b52f20f87a0624797a8bfc3fc6e098507
parent 1c9761e30d6eccfe104928cdc961ed1d3a5e2f6b

Fix 3379239: Catch exceptions from workaround for OOM.

This catches possible exceptions caused by attempting to
unregister a receiver that may have already been unregistered.
This is related to the OOM issue workaround in Change I99a7e0c3.

Change-Id: Ib69a8acc6b12659125c958a03efac0a8a68a3859

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
+                }
             }
         }
     }