diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2011-12-15 11:51:32 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-15 11:51:32 -0800 |
| commit | 56381b548148dfd2dee3e08613f70428fbf3e272 (patch) | |
| tree | 439f0545e63f0b8b6e38641938a846fc309a3858 | |
| parent | 3766a7a27535101e62af958b1d2d710daa166d7d (diff) | |
| parent | 7f97e65add29b3887755e998804b013168f773b1 (diff) | |
| download | frameworks_base-56381b548148dfd2dee3e08613f70428fbf3e272.zip frameworks_base-56381b548148dfd2dee3e08613f70428fbf3e272.tar.gz frameworks_base-56381b548148dfd2dee3e08613f70428fbf3e272.tar.bz2 | |
Merge "Clear reply before writing exception."
| -rw-r--r-- | core/java/android/os/Binder.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/os/Binder.java b/core/java/android/os/Binder.java index c25ebb7..24569fa 100644 --- 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; } |