OSDN Git Service

Merge "Prioritize delete jobs by adding them to a separate thread pool." into nyc...
authorGarfield Tan <xutan@google.com>
Thu, 2 Jun 2016 00:47:39 +0000 (00:47 +0000)
committerGarfield, Tan <xutan@google.com>
Thu, 2 Jun 2016 17:17:59 +0000 (10:17 -0700)
commitcd9780abff0c22573573c9592f4658700e1d863e
treea7139261ab69110fea02cbd4bb033b817504085c
parentea0065c5de9301b3b805e52efc6a26a55a52bd43
Merge "Prioritize delete jobs by adding them to a separate thread pool." into nyc-andromeda-dev

 Conflicts:
packages/DocumentsUI/src/com/android/documentsui/services/FileOperationService.java

Change-Id: I1eb4f265891542f8db59349ce158b192f1b14315
packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
packages/DocumentsUI/src/com/android/documentsui/dirlist/DocumentsAdapter.java
packages/DocumentsUI/src/com/android/documentsui/dirlist/ModelBackedDocumentsAdapter.java
packages/DocumentsUI/src/com/android/documentsui/dirlist/SectionBreakDocumentsAdapterWrapper.java
packages/DocumentsUI/src/com/android/documentsui/services/FileOperationService.java
packages/DocumentsUI/tests/Android.mk
packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/ModelBackedDocumentsAdapterTest.java
packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/TestDocumentsAdapter.java
packages/DocumentsUI/tests/src/com/android/documentsui/services/FileOperationServiceTest.java
packages/DocumentsUI/tests/src/com/android/documentsui/services/TestJob.java
packages/DocumentsUI/tests/src/com/android/documentsui/services/TestScheduledExecutorService.java