diff options
| author | Jim Miller <jaggies@google.com> | 2011-01-29 07:08:58 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-29 07:08:58 -0800 |
| commit | 4485edce05aecd5a8fd9bdb215e2a4386c520fe4 (patch) | |
| tree | e88e189af548ff34f71ff60904463694adc153b1 /core/java/com | |
| parent | e741e5400e760536f6a4d714fddf87e8e5266ce2 (diff) | |
| parent | 42a461570b9c5502959e429c4f16ca5ca860c4f2 (diff) | |
| download | frameworks_base-4485edce05aecd5a8fd9bdb215e2a4386c520fe4.zip frameworks_base-4485edce05aecd5a8fd9bdb215e2a4386c520fe4.tar.gz frameworks_base-4485edce05aecd5a8fd9bdb215e2a4386c520fe4.tar.bz2 | |
am 42a46157: Fix 3379239: Catch exceptions from workaround for OOM.
* commit '42a461570b9c5502959e429c4f16ca5ca860c4f2':
Fix 3379239: Catch exceptions from workaround for OOM.
Diffstat (limited to 'core/java/com')
| -rw-r--r-- | core/java/com/android/internal/widget/DigitalClock.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/core/java/com/android/internal/widget/DigitalClock.java b/core/java/com/android/internal/widget/DigitalClock.java index 2bc9dd1..0885b6e 100644 --- a/core/java/com/android/internal/widget/DigitalClock.java +++ b/core/java/com/android/internal/widget/DigitalClock.java @@ -86,7 +86,11 @@ public class DigitalClock extends RelativeLayout { } }); } else { - mContext.unregisterReceiver(this); + try { + mContext.unregisterReceiver(this); + } catch (RuntimeException e) { + // Shouldn't happen + } } } }; @@ -130,7 +134,11 @@ public class DigitalClock extends RelativeLayout { digitalClock.setDateFormat(); digitalClock.updateTime(); } else { - mContext.getContentResolver().unregisterContentObserver(this); + try { + mContext.getContentResolver().unregisterContentObserver(this); + } catch (RuntimeException e) { + // Shouldn't happen + } } } } |