commit bef056732bb574b21d06cf574c2d1ad04b1360a9
author Narayan Kamath <narayan@google.com> Wed Jul 12 10:51:22 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 12 10:51:22 2017 +0000
tree 527106b6d5584483893d91b85953c3c74d538051
parent 2b2e769d4973667131d0b38dee6054d4eef5d4aa
parent 2f6af94c8e3b89b0f846357cb80f952d25209594

Merge "Binder: Don't attempt to catch OutOfMemoryError"

core/java/android/os/Binder.java

diff --git a/core/java/android/os/Binder.java b/core/java/android/os/Binder.java
index 44e6f1b..5331304 100644
--- a/core/java/android/os/Binder.java
+++ b/core/java/android/os/Binder.java
@@ -687,13 +687,6 @@
                 reply.writeException(e);
             }
             res = true;
-        } catch (OutOfMemoryError e) {
-            // Unconditionally log this, since this is generally unrecoverable.
-            Log.e(TAG, "Caught an OutOfMemoryError from the binder stub implementation.", e);
-            RuntimeException re = new RuntimeException("Out of memory", e);
-            reply.setDataPosition(0);
-            reply.writeException(re);
-            res = true;
         } finally {
             if (tracingEnabled) {
                 Trace.traceEnd(Trace.TRACE_TAG_ALWAYS);