Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Include cause when reporting errors." into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-06-16 19:14:04 +00:00
committed by Android (Google) Code Review
parent 47c3afa10b 56d950c5e6
commit 60585e6c54
3 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
packages/DocumentsUI/src/com/android/documentsui/services/CopyJob.java
View File

@@ -227,7 +227,7 @@ class CopyJob extends Job {
try { try {
mBatchSize = calculateSize(mSrcs); mBatchSize = calculateSize(mSrcs);
} catch (ResourceException e) { } catch (ResourceException e) {
Log.w(TAG, "Failed to calculate total size. Copying without progress."); Log.w(TAG, "Failed to calculate total size. Copying without progress.", e);
mBatchSize = -1; mBatchSize = -1;
} }
@@ -236,25 +236,19 @@ class CopyJob extends Job {
for (int i = 0; i < mSrcs.size() && !isCanceled(); ++i) { for (int i = 0; i < mSrcs.size() && !isCanceled(); ++i) {
srcInfo = mSrcs.get(i); srcInfo = mSrcs.get(i);
// Guard unsupported recursive operation.
try {
if (dstInfo.equals(srcInfo) || isDescendentOf(srcInfo, dstInfo)) {
throw new ResourceException("Cannot copy to itself recursively.");
}
} catch (ResourceException e) {
Log.e(TAG, e.toString());
onFileFailed(srcInfo);
continue;
}
if (DEBUG) Log.d(TAG, if (DEBUG) Log.d(TAG,
"Copying " + srcInfo.displayName + " (" + srcInfo.derivedUri + ")" "Copying " + srcInfo.displayName + " (" + srcInfo.derivedUri + ")"
+ " to " + dstInfo.displayName + " (" + dstInfo.derivedUri + ")"); + " to " + dstInfo.displayName + " (" + dstInfo.derivedUri + ")");
try { try {
processDocument(srcInfo, null, dstInfo); if (dstInfo.equals(srcInfo) || isDescendentOf(srcInfo, dstInfo)) {
Log.e(TAG, "Skipping recursive copy of " + srcInfo.derivedUri);
onFileFailed(srcInfo);
} else {
processDocument(srcInfo, null, dstInfo);
}
} catch (ResourceException e) { } catch (ResourceException e) {
Log.e(TAG, e.toString()); Log.e(TAG, "Failed to copy " + srcInfo.derivedUri, e);
onFileFailed(srcInfo); onFileFailed(srcInfo);
} }
} }
@@ -306,7 +300,7 @@ class CopyJob extends Job {
} }
} catch (RemoteException | RuntimeException e) { } catch (RemoteException | RuntimeException e) {
Log.e(TAG, "Provider side copy failed for: " + src.derivedUri Log.e(TAG, "Provider side copy failed for: " + src.derivedUri
+ " due to an exception: " + e); + " due to an exception.", e);
} }
// If optimized copy fails, then fallback to byte-by-byte copy. // If optimized copy fails, then fallback to byte-by-byte copy.
if (DEBUG) Log.d(TAG, "Fallback to byte-by-byte copy for: " + src.derivedUri); if (DEBUG) Log.d(TAG, "Fallback to byte-by-byte copy for: " + src.derivedUri);

2
packages/DocumentsUI/src/com/android/documentsui/services/DeleteJob.java
View File

@@ -86,7 +86,7 @@ final class DeleteJob extends Job {
try { try {
deleteDocument(doc, mSrcParent); deleteDocument(doc, mSrcParent);
} catch (ResourceException e) { } catch (ResourceException e) {
Log.e(TAG, "Failed to delete document @ " + doc.derivedUri); Log.e(TAG, "Failed to delete document @ " + doc.derivedUri, e);
onFileFailed(doc); onFileFailed(doc);
} }
} }

2
packages/DocumentsUI/src/com/android/documentsui/services/MoveJob.java
View File

@@ -98,7 +98,7 @@ final class MoveJob extends CopyJob {
} }
} catch (RemoteException | RuntimeException e) { } catch (RemoteException | RuntimeException e) {
Log.e(TAG, "Provider side move failed for: " + src.derivedUri Log.e(TAG, "Provider side move failed for: " + src.derivedUri
+ " due to an exception: " + e); + " due to an exception: ", e);
} }
// If optimized move fails, then fallback to byte-by-byte copy. // If optimized move fails, then fallback to byte-by-byte copy.
if (DEBUG) Log.d(TAG, "Fallback to byte-by-byte move for: " + src.derivedUri); if (DEBUG) Log.d(TAG, "Fallback to byte-by-byte move for: " + src.derivedUri);