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

Commit 1cad5187 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix assertion error in picker initialization." into nyc-andromeda-dev

parents b285b40d 73af1f0c
Loading
Loading
Loading
Loading
+1 −5
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import com.android.documentsui.base.State;
import com.android.documentsui.dirlist.FragmentTuner;
import com.android.documentsui.dirlist.Model;
import com.android.documentsui.dirlist.Model.Update;
import com.android.documentsui.dirlist.MultiSelectManager;

import javax.annotation.Nullable;

@@ -135,7 +134,6 @@ final class Tuner extends FragmentTuner {
    private static final class Config {

        @Nullable Model model;
        @Nullable MultiSelectManager selectionMgr;
        boolean searchMode;

        private final EventListener<Update> mModelUpdateListener;
@@ -149,12 +147,10 @@ final class Tuner extends FragmentTuner {
        private boolean modelLoadObserved;

        public void reset(Model model, boolean searchMode) {
            this.searchMode = searchMode;
            assert(model != null);
            assert(selectionMgr != null);

            this.searchMode = searchMode;
            this.model = model;
            this.selectionMgr = selectionMgr;

            model.addUpdateListener(mModelUpdateListener);
            modelLoadObserved = false;