Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d34c1495: Merge "Prevent system crash when OOM in Binder thread."

Browse Source 
* commit 'd34c1495020e5d72dd18959fb906375dc0874c04':
  Prevent system crash when OOM in Binder thread.
This commit is contained in:
Jean-Baptiste Queru
2010-11-17 17:56:05 -08:00
committed by Android Git Automerger
parent 218e00336a d34c149502
commit 74923d3ae4
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/os/Binder.java
View File

@@ -324,6 +324,10 @@ public class Binder implements IBinder {
} catch (RuntimeException e) { } catch (RuntimeException e) {
reply.writeException(e); reply.writeException(e);
res = true; res = true;
} catch (OutOfMemoryError e) {
RuntimeException re = new RuntimeException("Out of memory", e);
reply.writeException(re);
res = true;
} }
reply.recycle(); reply.recycle();
data.recycle(); data.recycle();