diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-11-17 17:56:05 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-17 17:56:05 -0800 |
| commit | 74923d3ae4bf7043a62a02c4df988ef3255737ce (patch) | |
| tree | b163aed99cc98f688b020600c2ab252c1a1911ce | |
| parent | 218e00336a9dc348f8487442e58f7e6d1376b9e1 (diff) | |
| parent | d34c1495020e5d72dd18959fb906375dc0874c04 (diff) | |
| download | frameworks_base-74923d3ae4bf7043a62a02c4df988ef3255737ce.zip frameworks_base-74923d3ae4bf7043a62a02c4df988ef3255737ce.tar.gz frameworks_base-74923d3ae4bf7043a62a02c4df988ef3255737ce.tar.bz2 | |
am d34c1495: Merge "Prevent system crash when OOM in Binder thread."
* commit 'd34c1495020e5d72dd18959fb906375dc0874c04':
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 f8260ca..a402c91 100644 --- a/core/java/android/os/Binder.java +++ b/core/java/android/os/Binder.java @@ -324,6 +324,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(); |