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

am: f846d8518b

* commit 'f846d8518bdf788bbba9ace89d8fd04c79946edd':
  Fix an assertion to avoid crash on deletions in Recent root.

Change-Id: I13b89ea99d8319da7cbb001a024814757b1beec7
This commit is contained in:
Garfield Tan
2016-05-27 03:50:58 +00:00
committed by android-build-merger

View File

@@ -308,7 +308,9 @@ abstract public class Job implements Runnable {
String id, DocumentStack stack, List<DocumentInfo> srcs,
DocumentInfo srcParent) {
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);
}
}