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

Commit 06a1a845 authored by Kenny Root's avatar Kenny Root Committed by Android Git Automerger
Browse files

am 37c69fdd: Merge "Use java.util.Objects instead on internal API" 

* commit '37c69fdd826f3973966430adc1abfbefc19bc16e':
  Use java.util.Objects instead on internal API
parents 8ae43272 16d8598b

src/com/android/documentsui/RootsCache.java

+3 −3
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ import com.android.documentsui.DocumentsActivity.State; 
import com.android.documentsui.model.RootInfo;

import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.Objects;

import com.google.android.collect.Lists;

import com.google.android.collect.Sets;

import com.google.common.collect.ArrayListMultimap;
@@ -51,6 +50,7 @@ import libcore.io.IoUtils; 
import java.util.Collection;

import java.util.HashSet;

import java.util.List;

import java.util.Objects;

import java.util.concurrent.CountDownLatch;

import java.util.concurrent.TimeUnit;
@@ -295,7 +295,7 @@ public class RootsCache { 


    private RootInfo getRootLocked(String authority, String rootId) {

        for (RootInfo root : mRoots.get(authority)) {

            if (Objects.equal(root.rootId, rootId)) {

            if (Objects.equals(root.rootId, rootId)) {

                return root;

            }

        }
@@ -308,7 +308,7 @@ public class RootsCache { 
        synchronized (mLock) {

            final int rootIcon = root.derivedIcon != 0 ? root.derivedIcon : root.icon;

            for (RootInfo test : mRoots.get(root.authority)) {

                if (Objects.equal(test.rootId, root.rootId)) {

                if (Objects.equals(test.rootId, root.rootId)) {

                    continue;

                }

                final int testIcon = test.derivedIcon != 0 ? test.derivedIcon : test.icon;

src/com/android/documentsui/RootsFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -46,13 +46,13 @@ import android.widget.TextView; 
import com.android.documentsui.DocumentsActivity.State;

import com.android.documentsui.model.DocumentInfo;

import com.android.documentsui.model.RootInfo;

import com.android.internal.util.Objects;

import com.google.common.collect.Lists;



import java.util.Collection;

import java.util.Collections;

import java.util.Comparator;

import java.util.List;

import java.util.Objects;



/**

 * Display list of known storage backend roots.
@@ -157,7 +157,7 @@ public class RootsFragment extends Fragment { 
            final Object item = mAdapter.getItem(i);

            if (item instanceof RootItem) {

                final RootInfo testRoot = ((RootItem) item).root;

                if (Objects.equal(testRoot, root)) {

                if (Objects.equals(testRoot, root)) {

                    mList.setItemChecked(i, true);

                    return;

                }