Merge "Clean up error handling in CopyService." into mnc-dev (e74007de) · Commits · e / os / android_frameworks_base

packages/DocumentsUI/src/com/android/documentsui/CopyService.java

+5 −7

Original line number	Diff line number	Diff line
		@@ -466,14 +466,12 @@ public class CopyService extends IntentService {
		srcFile.checkError();
		} catch (IOException e) {
		copyError = e;
		} finally {
		if (copyError != null) {
		try {
		dstFile.closeWithError(copyError.getMessage());
		} catch (IOException e) {
		Log.e(TAG, "Error closing destination", e);
		}
		} catch (IOException closeError) {
		Log.e(TAG, "Error closing destination", closeError);
		}
		} finally {
		// This also ensures the file descriptors are closed.
		IoUtils.closeQuietly(src);
		IoUtils.closeQuietly(dst);