Merge "Clear reply before writing exception."

2011-12-15 11:51:32 -08:00
parent 3766a7a275 7f97e65add
commit 56381b5481
1 changed files with 3 additions and 0 deletions
--- a/core/java/android/os/Binder.java
+++ b/core/java/android/os/Binder.java
@@ -337,13 +337,16 @@ public class Binder implements IBinder {
        try {
            res = onTransact(code, data, reply, flags);
        } catch (RemoteException e) {
+            reply.setDataPosition(0);
            reply.writeException(e);
            res = true;
        } catch (RuntimeException e) {
+            reply.setDataPosition(0);
            reply.writeException(e);
            res = true;
        } catch (OutOfMemoryError e) {
            RuntimeException re = new RuntimeException("Out of memory", e);
+            reply.setDataPosition(0);
            reply.writeException(re);
            res = true;
        }