diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-11-17 17:49:19 -0800 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-11-17 17:49:19 -0800 |
| commit | d34c1495020e5d72dd18959fb906375dc0874c04 (patch) | |
| tree | 3e3341cd804844581488bd3830c6db524eb92944 | |
| parent | 11dba787e10ff5ddc27e834db42acefa33cd35be (diff) | |
| parent | 19f22745aa0fa2344850bac3234460add9d94c4e (diff) | |
| download | frameworks_base-d34c1495020e5d72dd18959fb906375dc0874c04.zip frameworks_base-d34c1495020e5d72dd18959fb906375dc0874c04.tar.gz frameworks_base-d34c1495020e5d72dd18959fb906375dc0874c04.tar.bz2 | |
Merge "Prevent system crash when OOM in Binder thread."
| -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(); |