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

Commit 3db2fa7f authored by Steve McKay's avatar Steve McKay Committed by android-build-merger
Browse files

Merge "Fix selecting all in DocumentsUI." into nyc-dev am: 03dab3e5 

am: 8afc15af

* commit '8afc15af':
  Fix selecting all in DocumentsUI.

Change-Id: Iad37de8e1a6ec7c2c7462480150386f503d62159
parents d7435cb7 8afc15af

packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -1110,7 +1110,7 @@ public class DirectoryFragment extends Fragment 
        List<String> enabled = new ArrayList<String>();

        for (String id : mAdapter.getModelIds()) {

            Cursor cursor = getModel().getItem(id);

            if (cursor != null) {

            if (cursor == null) {

                Log.w(TAG, "Skipping selection. Can't obtain cursor for modeId: " + id);

                continue;

            }
@@ -1202,7 +1202,7 @@ public class DirectoryFragment extends Fragment 
            String id = getModelId(v);

            if (id != null) {

                Cursor dstCursor = mModel.getItem(id);

                if (dstCursor != null) {

                if (dstCursor == null) {

                    Log.w(TAG, "Invalid destination. Can't obtain cursor for modelId: " + id);

                    return null;

                }