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

am: f4e1c42240

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

Change-Id: Iafba5b17b7dd89ad9bfdc8e8719f4ade5ff4d8ee
This commit is contained in:
Garfield Tan
2016-05-27 22:02:59 +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);
}
}