Merge "Allow disk I/O while performing dump()." (eb00769e) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -15092,7 +15092,7 @@ package android.os {
		field public static final android.os.Parcelable.Creator STRING_CREATOR;
		}

		public class ParcelFileDescriptor implements android.os.Parcelable {
		public class ParcelFileDescriptor implements java.io.Closeable android.os.Parcelable {
		ctor public ParcelFileDescriptor(android.os.ParcelFileDescriptor);
		method public static android.os.ParcelFileDescriptor adoptFd(int);
		method public void close() throws java.io.IOException;

core/java/android/app/ActivityThread.java

+32 −24

Original line number	Diff line number	Diff line
		@@ -102,6 +102,8 @@ import java.util.Map;
		import java.util.TimeZone;
		import java.util.regex.Pattern;

		import libcore.io.IoUtils;

		import dalvik.system.CloseGuard;

		final class SuperNotCalledException extends AndroidRuntimeException {
		@@ -2357,41 +2359,47 @@ public final class ActivityThread {
		}

		private void handleDumpService(DumpComponentInfo info) {
		final StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();
		try {
		Service s = mServices.get(info.token);
		if (s != null) {
		PrintWriter pw = new PrintWriter(new FileOutputStream(info.fd.getFileDescriptor()));
		s.dump(info.fd.getFileDescriptor(), pw, info.args);
		pw.flush();
		try {
		info.fd.close();
		} catch (IOException e) {
		}
		} finally {
		IoUtils.closeQuietly(info.fd);
		StrictMode.setThreadPolicy(oldPolicy);
		}
		}

		private void handleDumpActivity(DumpComponentInfo info) {
		final StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();
		try {
		ActivityClientRecord r = mActivities.get(info.token);
		if (r != null && r.activity != null) {
		PrintWriter pw = new PrintWriter(new FileOutputStream(info.fd.getFileDescriptor()));
		r.activity.dump(info.prefix, info.fd.getFileDescriptor(), pw, info.args);
		pw.flush();
		try {
		info.fd.close();
		} catch (IOException e) {
		}
		} finally {
		IoUtils.closeQuietly(info.fd);
		StrictMode.setThreadPolicy(oldPolicy);
		}
		}

		private void handleDumpProvider(DumpComponentInfo info) {
		final StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();
		try {
		ProviderClientRecord r = mLocalProviders.get(info.token);
		if (r != null && r.mLocalProvider != null) {
		PrintWriter pw = new PrintWriter(new FileOutputStream(info.fd.getFileDescriptor()));
		r.mLocalProvider.dump(info.fd.getFileDescriptor(), pw, info.args);
		pw.flush();
		try {
		info.fd.close();
		} catch (IOException e) {
		}
		} finally {
		IoUtils.closeQuietly(info.fd);
		StrictMode.setThreadPolicy(oldPolicy);
		}
		}

core/java/android/os/ParcelFileDescriptor.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		*/

		package android.os;
		import java.io.Closeable;
		import java.io.File;
		import java.io.FileDescriptor;
		import java.io.FileInputStream;
		@@ -28,7 +29,7 @@ import java.net.Socket;
		* The FileDescriptor returned by {@link Parcel#readFileDescriptor}, allowing
		* you to close it when done with it.
		*/
		public class ParcelFileDescriptor implements Parcelable {
		public class ParcelFileDescriptor implements Parcelable, Closeable {
		private final FileDescriptor mFileDescriptor;
		private boolean mClosed;
		//this field is to create wrapper for ParcelFileDescriptor using another