Merge "Fix StrictMode for Binder.dump()" into gingerbread (eacf0ecd) · Commits · e / os / android_frameworks_base

core/java/android/os/Binder.java

+11 −1

Original line number	Diff line number	Diff line
		@@ -226,9 +226,16 @@ public class Binder implements IBinder {
		try {
		fd.close();
		} catch (IOException e) {
		// swallowed, not propagated back to the caller
		}
		}
		}
		// Write the StrictMode header.
		if (reply != null) {
		reply.writeNoException();
		} else {
		StrictMode.clearGatheredViolations();
		}
		return true;
		}
		return false;
		@@ -341,12 +348,15 @@ final class BinderProxy implements IBinder {

		public void dump(FileDescriptor fd, String[] args) throws RemoteException {
		Parcel data = Parcel.obtain();
		Parcel reply = Parcel.obtain();
		data.writeFileDescriptor(fd);
		data.writeStringArray(args);
		try {
		transact(DUMP_TRANSACTION, data, null, 0);
		transact(DUMP_TRANSACTION, data, reply, 0);
		reply.readException();
		} finally {
		data.recycle();
		reply.recycle();
		}
		}