Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcee5e77 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am 37ba54ac: am eb4dc749: am 6d0d4b5b: Merge "Mask OOBE when filtering recent... 

am 37ba54ac: am eb4dc749: am 6d0d4b5b: Merge "Mask OOBE when filtering recent documents." into klp-dev

* commit '37ba54ac13e6f8cff70d3138a029cfdd4733aba7':
  Mask OOBE when filtering recent documents.
parents f3dd5fea 8ae43272

src/com/android/documentsui/FilteringCursorWrapper.java

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ public class FilteringCursorWrapper extends AbstractCursor { 
        mPosition = new int[count];



        cursor.moveToPosition(-1);

        while (cursor.moveToNext()) {

        while (cursor.moveToNext() && mCount < count) {

            final String mimeType = getCursorString(cursor, Document.COLUMN_MIME_TYPE);

            final long lastModified = getCursorLong(cursor, Document.COLUMN_LAST_MODIFIED);

            if (rejectMimes != null && MimePredicate.mimeMatches(rejectMimes, mimeType)) {

src/com/android/documentsui/RecentLoader.java

+4 −0
Original line number Diff line number Diff line
@@ -55,6 +55,10 @@ import java.util.concurrent.TimeUnit; 
public class RecentLoader extends AsyncTaskLoader<DirectoryResult> {

    private static final boolean LOGD = true;



    // TODO: clean up cursor ownership so background thread doesn't traverse

    // previously returned cursors for filtering/sorting; this currently races

    // with the UI thread.



    private static final int MAX_OUTSTANDING_RECENTS = 4;

    private static final int MAX_OUTSTANDING_RECENTS_SVELTE = 2;