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

Merge "Merge "Fix an assertion to avoid crash on deletions in Recent root." into nyc-dev am: 7a91029bff am: f846d8518b" into nyc-mr1-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2016-05-27 03:52:11 +00:00
committed by Android (Google) Code Review
parent 5af6e7d4b5 da19f14dd5
commit f4e1c42240
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/DocumentsUI/src/com/android/documentsui/services/Job.java
View File

@@ -308,7 +308,9 @@ abstract public class Job implements Runnable {
String id, DocumentStack stack, List<DocumentInfo> srcs, String id, DocumentStack stack, List<DocumentInfo> srcs,
DocumentInfo srcParent) { DocumentInfo srcParent) {
assert(!srcs.isEmpty()); assert(!srcs.isEmpty());
assert(stack.peek().isDirectory()); // we can't currently delete from archives. // stack is empty if we delete docs from recent.
// we can't currently delete from archives.
assert(stack.isEmpty() || stack.peek().isDirectory());
return new DeleteJob(service, appContext, listener, id, stack, srcs, srcParent); return new DeleteJob(service, appContext, listener, id, stack, srcs, srcParent);
} }
} }