diff options
| author | Steve Kondik <shade@chemlab.org> | 2010-11-06 06:47:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2010-11-06 06:47:40 +0000 |
| commit | 8198ab6c9943852c9cc135c27eb94d78ff3d700c (patch) | |
| tree | 2841ce9ccd3e8a29235c8598b8d0fe87c0311982 /core/java | |
| parent | d6ccdeed924295cae0528c068706186de3b5bd27 (diff) | |
| parent | b619086abafcb78dc8806d1ec02e2910b6ed5c9c (diff) | |
| download | frameworks_base-8198ab6c9943852c9cc135c27eb94d78ff3d700c.zip frameworks_base-8198ab6c9943852c9cc135c27eb94d78ff3d700c.tar.gz frameworks_base-8198ab6c9943852c9cc135c27eb94d78ff3d700c.tar.bz2 | |
Merge "Prevent system crash when OOM in Binder thread." into froyo
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/os/Binder.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/os/Binder.java b/core/java/android/os/Binder.java index c9df567..1db8f68 100644 --- a/core/java/android/os/Binder.java +++ b/core/java/android/os/Binder.java @@ -292,6 +292,10 @@ public class Binder implements IBinder { } catch (RuntimeException e) { reply.writeException(e); res = true; + } catch (OutOfMemoryError e) { + RuntimeException re = new RuntimeException("Out of memory", e); + reply.writeException(re); + res = true; } reply.recycle(); data.recycle(); |