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

Commit 2bbe02b2 authored by Tomasz Mikolajewski's avatar Tomasz Mikolajewski Committed by android-build-merger
Browse files

Merge "Fix selecting all in DocumentsUI." into nyc-dev 

am: 03dab3e

* commit '03dab3e56240e6ae5f8bd471ac190fe0a90b5bcd':
  Fix selecting all in DocumentsUI.

Change-Id: Ida9f2f4a8427fea0d31f66e087bbaa291c48a620
parents b58ad42f e0fed062

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

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

        List<String> enabled = new ArrayList<String>();

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

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

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

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

            if (cursor != null) {

            if (cursor == null) {

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

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

                continue;

                continue;

            }

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

            String id = getModelId(v);

            if (id != null) {

            if (id != null) {

                Cursor dstCursor = mModel.getItem(id);

                Cursor dstCursor = mModel.getItem(id);

                if (dstCursor != null) {

                if (dstCursor == null) {

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

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

                    return null;

                    return null;

                }

                }