diff options
author | Kenny Root <kroot@google.com> | 2013-12-13 12:00:26 -0800 |
---|---|---|
committer | Kenny Root <kroot@google.com> | 2013-12-13 13:40:30 -0800 |
commit | e6585b32ea586743258a5457e2184ffc087f2d2f (patch) | |
tree | 409f3c83c78e878a5efe2a0cc500659a27c77f38 /packages/DocumentsUI | |
parent | 584ace0d3f79ff43db9298798065dd5beaa66a45 (diff) | |
download | frameworks_base-e6585b32ea586743258a5457e2184ffc087f2d2f.zip frameworks_base-e6585b32ea586743258a5457e2184ffc087f2d2f.tar.gz frameworks_base-e6585b32ea586743258a5457e2184ffc087f2d2f.tar.bz2 |
Use java.util.Objects instead on internal API
Not needed since java.util.Objects implements all the needed
functionality.
Change-Id: Icd31d49a9801d1705427f028e9ac927d58e7d34c
Diffstat (limited to 'packages/DocumentsUI')
-rw-r--r-- | packages/DocumentsUI/src/com/android/documentsui/RootsCache.java | 6 | ||||
-rw-r--r-- | packages/DocumentsUI/src/com/android/documentsui/RootsFragment.java | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java b/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java index f6b43c7..f1dca1d 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java +++ b/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java @@ -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; diff --git a/packages/DocumentsUI/src/com/android/documentsui/RootsFragment.java b/packages/DocumentsUI/src/com/android/documentsui/RootsFragment.java index 931dac9..923c79c 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/RootsFragment.java +++ b/packages/DocumentsUI/src/com/android/documentsui/RootsFragment.java @@ -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; } |