Remove uses of libcore.util.Objects.hashCode / equals.
Use public API in java.util.Objects instead.
Test: make
Change-Id: I413280f254743a2efa2640a2194693aeb5980605
diff --git a/services/autofill/java/com/android/server/autofill/ui/FillUi.java b/services/autofill/java/com/android/server/autofill/ui/FillUi.java
index c504465..d64244d 100644
--- a/services/autofill/java/com/android/server/autofill/ui/FillUi.java
+++ b/services/autofill/java/com/android/server/autofill/ui/FillUi.java
@@ -54,12 +54,11 @@
import com.android.server.UiThread;
import com.android.server.autofill.Helper;
-import libcore.util.Objects;
-
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.Objects;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -356,7 +355,7 @@
filterText = filterText.toLowerCase();
}
- if (Objects.equal(mFilterText, filterText)) {
+ if (Objects.equals(mFilterText, filterText)) {
return;
}
mFilterText = filterText;
diff --git a/services/core/java/com/android/server/display/DisplayDeviceInfo.java b/services/core/java/com/android/server/display/DisplayDeviceInfo.java
index 6db3b44..349e1c8 100644
--- a/services/core/java/com/android/server/display/DisplayDeviceInfo.java
+++ b/services/core/java/com/android/server/display/DisplayDeviceInfo.java
@@ -23,8 +23,7 @@
import android.view.Surface;
import java.util.Arrays;
-
-import libcore.util.Objects;
+import java.util.Objects;
/**
* Describes the characteristics of a physical display device.
@@ -312,28 +311,28 @@
if (colorMode != other.colorMode) {
diff |= DIFF_COLOR_MODE;
}
- if (!Objects.equal(name, other.name)
- || !Objects.equal(uniqueId, other.uniqueId)
+ if (!Objects.equals(name, other.name)
+ || !Objects.equals(uniqueId, other.uniqueId)
|| width != other.width
|| height != other.height
|| modeId != other.modeId
|| defaultModeId != other.defaultModeId
|| !Arrays.equals(supportedModes, other.supportedModes)
|| !Arrays.equals(supportedColorModes, other.supportedColorModes)
- || !Objects.equal(hdrCapabilities, other.hdrCapabilities)
+ || !Objects.equals(hdrCapabilities, other.hdrCapabilities)
|| densityDpi != other.densityDpi
|| xDpi != other.xDpi
|| yDpi != other.yDpi
|| appVsyncOffsetNanos != other.appVsyncOffsetNanos
|| presentationDeadlineNanos != other.presentationDeadlineNanos
|| flags != other.flags
- || !Objects.equal(displayCutout, other.displayCutout)
+ || !Objects.equals(displayCutout, other.displayCutout)
|| touch != other.touch
|| rotation != other.rotation
|| type != other.type
- || !Objects.equal(address, other.address)
+ || !Objects.equals(address, other.address)
|| ownerUid != other.ownerUid
- || !Objects.equal(ownerPackageName, other.ownerPackageName)) {
+ || !Objects.equals(ownerPackageName, other.ownerPackageName)) {
diff |= DIFF_OTHER;
}
return diff;
diff --git a/services/core/java/com/android/server/display/LogicalDisplay.java b/services/core/java/com/android/server/display/LogicalDisplay.java
index 132f083..e582fdf 100644
--- a/services/core/java/com/android/server/display/LogicalDisplay.java
+++ b/services/core/java/com/android/server/display/LogicalDisplay.java
@@ -25,8 +25,7 @@
import java.io.PrintWriter;
import java.util.Arrays;
import java.util.List;
-
-import libcore.util.Objects;
+import java.util.Objects;
/**
* Describes how a logical display is configured.
@@ -225,7 +224,7 @@
// logical display that they are sharing. (eg. Adjust size for pixel-perfect
// mirroring over HDMI.)
DisplayDeviceInfo deviceInfo = mPrimaryDisplayDevice.getDisplayDeviceInfoLocked();
- if (!Objects.equal(mPrimaryDisplayDeviceInfo, deviceInfo)) {
+ if (!Objects.equals(mPrimaryDisplayDeviceInfo, deviceInfo)) {
mBaseDisplayInfo.layerStack = mLayerStack;
mBaseDisplayInfo.flags = 0;
if ((deviceInfo.flags & DisplayDeviceInfo.FLAG_SUPPORTS_PROTECTED_BUFFERS) != 0) {
diff --git a/services/core/java/com/android/server/display/PersistentDataStore.java b/services/core/java/com/android/server/display/PersistentDataStore.java
index 1af03de..89cef62 100644
--- a/services/core/java/com/android/server/display/PersistentDataStore.java
+++ b/services/core/java/com/android/server/display/PersistentDataStore.java
@@ -52,9 +52,9 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import libcore.io.IoUtils;
-import libcore.util.Objects;
/**
* Manages persistent state recorded by the display manager service as an XML file.
@@ -180,7 +180,7 @@
if (index >= 0) {
alias = mRememberedWifiDisplays.get(index).getDeviceAlias();
}
- if (!Objects.equal(display.getDeviceAlias(), alias)) {
+ if (!Objects.equals(display.getDeviceAlias(), alias)) {
return new WifiDisplay(display.getDeviceAddress(), display.getDeviceName(),
alias, display.isAvailable(), display.canConnect(), display.isRemembered());
}
diff --git a/services/core/java/com/android/server/display/WifiDisplayAdapter.java b/services/core/java/com/android/server/display/WifiDisplayAdapter.java
index 08c0a1a..3293379 100644
--- a/services/core/java/com/android/server/display/WifiDisplayAdapter.java
+++ b/services/core/java/com/android/server/display/WifiDisplayAdapter.java
@@ -39,11 +39,10 @@
import android.view.SurfaceControl;
import java.io.PrintWriter;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.ArrayList;
-
-import libcore.util.Objects;
+import java.util.Objects;
/**
* Connects to Wifi displays that implement the Miracast protocol.
@@ -248,7 +247,7 @@
}
WifiDisplay display = mPersistentDataStore.getRememberedWifiDisplay(address);
- if (display != null && !Objects.equal(display.getDeviceAlias(), alias)) {
+ if (display != null && !Objects.equals(display.getDeviceAlias(), alias)) {
display = new WifiDisplay(address, display.getDeviceName(), alias,
false, false, false);
if (mPersistentDataStore.rememberWifiDisplay(display)) {
diff --git a/services/core/java/com/android/server/display/WifiDisplayController.java b/services/core/java/com/android/server/display/WifiDisplayController.java
index 8932ca0..fc59b5b 100644
--- a/services/core/java/com/android/server/display/WifiDisplayController.java
+++ b/services/core/java/com/android/server/display/WifiDisplayController.java
@@ -53,8 +53,7 @@
import java.net.SocketException;
import java.util.ArrayList;
import java.util.Enumeration;
-
-import libcore.util.Objects;
+import java.util.Objects;
/**
* Manages all of the various asynchronous interactions with the {@link WifiP2pManager}
@@ -944,7 +943,7 @@
private void advertiseDisplay(final WifiDisplay display,
final Surface surface, final int width, final int height, final int flags) {
- if (!Objects.equal(mAdvertisedDisplay, display)
+ if (!Objects.equals(mAdvertisedDisplay, display)
|| mAdvertisedDisplaySurface != surface
|| mAdvertisedDisplayWidth != width
|| mAdvertisedDisplayHeight != height
diff --git a/services/core/java/com/android/server/dreams/DreamManagerService.java b/services/core/java/com/android/server/dreams/DreamManagerService.java
index dbccc07..5292d3e5f 100644
--- a/services/core/java/com/android/server/dreams/DreamManagerService.java
+++ b/services/core/java/com/android/server/dreams/DreamManagerService.java
@@ -58,8 +58,7 @@
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.List;
-
-import libcore.util.Objects;
+import java.util.Objects;
/**
* Service api for managing dreams.
@@ -349,7 +348,7 @@
private void startDreamLocked(final ComponentName name,
final boolean isTest, final boolean canDoze, final int userId) {
- if (Objects.equal(mCurrentDreamName, name)
+ if (Objects.equals(mCurrentDreamName, name)
&& mCurrentDreamIsTest == isTest
&& mCurrentDreamCanDoze == canDoze
&& mCurrentDreamUserId == userId) {
diff --git a/services/core/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java
index 4050790..a951d47 100644
--- a/services/core/java/com/android/server/input/InputManagerService.java
+++ b/services/core/java/com/android/server/input/InputManagerService.java
@@ -116,10 +116,10 @@
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
+import java.util.Objects;
import libcore.io.IoUtils;
import libcore.io.Streams;
-import libcore.util.Objects;
/*
* Wraps the C++ InputManager and provides its callbacks.
@@ -1462,7 +1462,7 @@
oldLayout = mDataStore.getCurrentKeyboardLayout(identifier.getDescriptor());
}
if (mDataStore.addKeyboardLayout(key, keyboardLayoutDescriptor)
- && !Objects.equal(oldLayout, mDataStore.getCurrentKeyboardLayout(key))) {
+ && !Objects.equals(oldLayout, mDataStore.getCurrentKeyboardLayout(key))) {
mHandler.sendEmptyMessage(MSG_RELOAD_KEYBOARD_LAYOUTS);
}
} finally {
@@ -1495,7 +1495,7 @@
removed |= mDataStore.removeKeyboardLayout(identifier.getDescriptor(),
keyboardLayoutDescriptor);
}
- if (removed && !Objects.equal(oldLayout,
+ if (removed && !Objects.equals(oldLayout,
mDataStore.getCurrentKeyboardLayout(key))) {
mHandler.sendEmptyMessage(MSG_RELOAD_KEYBOARD_LAYOUTS);
}
diff --git a/services/core/java/com/android/server/input/PersistentDataStore.java b/services/core/java/com/android/server/input/PersistentDataStore.java
index 372db41..c9f8b20 100644
--- a/services/core/java/com/android/server/input/PersistentDataStore.java
+++ b/services/core/java/com/android/server/input/PersistentDataStore.java
@@ -49,10 +49,10 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import libcore.io.IoUtils;
-import libcore.util.Objects;
/**
* Manages persistent state recorded by the input manager service as an XML file.
@@ -377,7 +377,7 @@
}
public boolean setCurrentKeyboardLayout(String keyboardLayout) {
- if (Objects.equal(mCurrentKeyboardLayout, keyboardLayout)) {
+ if (Objects.equals(mCurrentKeyboardLayout, keyboardLayout)) {
return false;
}
addKeyboardLayout(keyboardLayout);
@@ -432,7 +432,7 @@
private void updateCurrentKeyboardLayoutIfRemoved(
String removedKeyboardLayout, int removedIndex) {
- if (Objects.equal(mCurrentKeyboardLayout, removedKeyboardLayout)) {
+ if (Objects.equals(mCurrentKeyboardLayout, removedKeyboardLayout)) {
if (!mUnassociatedKeyboardLayouts.isEmpty()) {
int index = removedIndex;
if (index == mUnassociatedKeyboardLayouts.size()) {
diff --git a/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java
index a027fc6..43b1708 100644
--- a/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java
+++ b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java
@@ -35,13 +35,12 @@
import android.util.ArraySet;
import android.util.Slog;
-import libcore.util.Objects;
-
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
/**
@@ -106,7 +105,7 @@
final PackageInfo overlayPackage = overlayPackages.get(i);
final OverlayInfo oi = storedOverlayInfos.get(overlayPackage.packageName);
if (oi == null || !oi.targetPackageName.equals(overlayPackage.overlayTarget)
- || !Objects.equal(oi.category, overlayPackage.overlayCategory)) {
+ || !Objects.equals(oi.category, overlayPackage.overlayCategory)) {
// Update the overlay if it didn't exist or had the wrong target package.
mSettings.init(overlayPackage.packageName, newUserId,
overlayPackage.overlayTarget,
@@ -434,7 +433,7 @@
// Don't touch static overlays.
continue;
}
- if (withinCategory && !Objects.equal(disabledOverlayPackageInfo.overlayCategory,
+ if (withinCategory && !Objects.equals(disabledOverlayPackageInfo.overlayCategory,
oi.category)) {
// Don't touch overlays from other categories.
continue;
diff --git a/services/core/java/com/android/server/pm/ShortcutUser.java b/services/core/java/com/android/server/pm/ShortcutUser.java
index b7247df..c044c1c 100644
--- a/services/core/java/com/android/server/pm/ShortcutUser.java
+++ b/services/core/java/com/android/server/pm/ShortcutUser.java
@@ -32,8 +32,6 @@
import com.android.server.pm.ShortcutService.DumpFilter;
import com.android.server.pm.ShortcutService.InvalidFileFormatException;
-import libcore.util.Objects;
-
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -44,6 +42,7 @@
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
+import java.util.Objects;
import java.util.function.Consumer;
/**
@@ -454,7 +453,7 @@
private void setLauncher(ComponentName launcherComponent, boolean allowPurgeLastKnown) {
mCachedLauncher = launcherComponent; // Always update the in-memory cache.
- if (Objects.equal(mLastKnownLauncher, launcherComponent)) {
+ if (Objects.equals(mLastKnownLauncher, launcherComponent)) {
return;
}
if (!allowPurgeLastKnown && launcherComponent == null) {
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index 0eeaf66..de7e21a 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -101,7 +101,6 @@
import com.android.server.storage.DeviceStorageMonitorInternal;
import libcore.io.IoUtils;
-import libcore.util.Objects;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
@@ -122,6 +121,7 @@
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
+import java.util.Objects;
/**
* Service for {@link UserManager}.
@@ -604,7 +604,7 @@
return;
}
String currentAccount = userData.account;
- if (!Objects.equal(currentAccount, accountName)) {
+ if (!Objects.equals(currentAccount, accountName)) {
userData.account = accountName;
userToUpdate = userData;
}
diff --git a/services/core/java/com/android/server/pm/dex/PackageDexUsage.java b/services/core/java/com/android/server/pm/dex/PackageDexUsage.java
index a4a0a54..e3e1590 100644
--- a/services/core/java/com/android/server/pm/dex/PackageDexUsage.java
+++ b/services/core/java/com/android/server/pm/dex/PackageDexUsage.java
@@ -42,11 +42,11 @@
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import dalvik.system.VMRuntime;
import libcore.io.IoUtils;
-import libcore.util.Objects;
/**
* Stat file which store usage information about dex files.
@@ -830,7 +830,7 @@
// We detected an unsupported context.
mClassLoaderContext = UNSUPPORTED_CLASS_LOADER_CONTEXT;
} else if (!UNSUPPORTED_CLASS_LOADER_CONTEXT.equals(mClassLoaderContext) &&
- !Objects.equal(mClassLoaderContext, dexUseInfo.mClassLoaderContext)) {
+ !Objects.equals(mClassLoaderContext, dexUseInfo.mClassLoaderContext)) {
// We detected a context change.
mClassLoaderContext = VARIABLE_CLASS_LOADER_CONTEXT;
}
@@ -838,7 +838,7 @@
return updateIsas ||
(oldIsUsedByOtherApps != mIsUsedByOtherApps) ||
updateLoadingPackages
- || !Objects.equal(oldClassLoaderContext, mClassLoaderContext);
+ || !Objects.equals(oldClassLoaderContext, mClassLoaderContext);
}
public boolean isUsedByOtherApps() {
diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
index 38dc820..d67acc4 100644
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -100,14 +100,13 @@
import com.android.server.policy.WindowManagerPolicy;
import com.android.server.power.batterysaver.BatterySaverController;
-import libcore.util.Objects;
-
import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Objects;
/**
* The power manager service is responsible for coordinating power management
@@ -3976,7 +3975,7 @@
}
public boolean hasSameWorkSource(WorkSource workSource) {
- return Objects.equal(mWorkSource, workSource);
+ return Objects.equals(mWorkSource, workSource);
}
public void updateWorkSource(WorkSource workSource) {