From 607223f3b7a1c4dc3ac995f742f8d2da50d85ffc Mon Sep 17 00:00:00 2001 From: Narayan Kamath Date: Mon, 19 Feb 2018 14:09:02 +0000 Subject: [PATCH] Remove uses of libcore.util.Objects.hashCode / equals. Use public API in java.util.Objects instead. Test: make Change-Id: I413280f254743a2efa2640a2194693aeb5980605 --- .../android/hardware/display/WifiDisplay.java | 4 ++-- core/java/android/util/MapCollections.java | 9 ++++----- core/java/android/view/DisplayInfo.java | 13 ++++++------- core/java/android/widget/RemoteViews.java | 9 ++++----- core/java/com/android/internal/util/BitUtils.java | 5 ++--- .../android/internal/widget/CachingIconView.java | 4 ++-- .../android/providers/settings/SettingsState.java | 12 ++++++------ .../systemui/qs/customize/CustomizeTileView.java | 4 ++-- .../android/systemui/qs/external/CustomTile.java | 4 ++-- .../qs/external/TileLifecycleManager.java | 5 ++--- .../systemui/qs/external/TileServiceManager.java | 9 ++++----- .../android/systemui/qs/tileimpl/QSTileView.java | 6 +++--- .../systemui/tuner/RadioListPreference.java | 4 ++-- .../com/android/server/autofill/ui/FillUi.java | 5 ++--- .../android/server/display/DisplayDeviceInfo.java | 15 +++++++-------- .../android/server/display/LogicalDisplay.java | 5 ++--- .../server/display/PersistentDataStore.java | 4 ++-- .../server/display/WifiDisplayAdapter.java | 7 +++---- .../server/display/WifiDisplayController.java | 5 ++--- .../server/dreams/DreamManagerService.java | 5 ++--- .../android/server/input/InputManagerService.java | 6 +++--- .../android/server/input/PersistentDataStore.java | 6 +++--- .../server/om/OverlayManagerServiceImpl.java | 7 +++---- .../java/com/android/server/pm/ShortcutUser.java | 5 ++--- .../com/android/server/pm/UserManagerService.java | 4 ++-- .../android/server/pm/dex/PackageDexUsage.java | 6 +++--- .../android/server/power/PowerManagerService.java | 5 ++--- 27 files changed, 79 insertions(+), 94 deletions(-) diff --git a/core/java/android/hardware/display/WifiDisplay.java b/core/java/android/hardware/display/WifiDisplay.java index af5a84e611165..bb32c199993b6 100644 --- a/core/java/android/hardware/display/WifiDisplay.java +++ b/core/java/android/hardware/display/WifiDisplay.java @@ -19,7 +19,7 @@ package android.hardware.display; import android.os.Parcel; import android.os.Parcelable; -import libcore.util.Objects; +import java.util.Objects; /** * Describes the properties of a Wifi display. @@ -140,7 +140,7 @@ public final class WifiDisplay implements Parcelable { return other != null && mDeviceAddress.equals(other.mDeviceAddress) && mDeviceName.equals(other.mDeviceName) - && Objects.equal(mDeviceAlias, other.mDeviceAlias); + && Objects.equals(mDeviceAlias, other.mDeviceAlias); } /** diff --git a/core/java/android/util/MapCollections.java b/core/java/android/util/MapCollections.java index 80ab23c8261d7..a5212688c6c6b 100644 --- a/core/java/android/util/MapCollections.java +++ b/core/java/android/util/MapCollections.java @@ -16,13 +16,12 @@ package android.util; -import libcore.util.Objects; - import java.lang.reflect.Array; import java.util.Collection; import java.util.Iterator; import java.util.Map; import java.util.NoSuchElementException; +import java.util.Objects; import java.util.Set; /** @@ -143,8 +142,8 @@ abstract class MapCollections { return false; } Map.Entry e = (Map.Entry) o; - return Objects.equal(e.getKey(), colGetEntry(mIndex, 0)) - && Objects.equal(e.getValue(), colGetEntry(mIndex, 1)); + return Objects.equals(e.getKey(), colGetEntry(mIndex, 0)) + && Objects.equals(e.getValue(), colGetEntry(mIndex, 1)); } @Override @@ -195,7 +194,7 @@ abstract class MapCollections { return false; } Object foundVal = colGetEntry(index, 1); - return Objects.equal(foundVal, e.getValue()); + return Objects.equals(foundVal, e.getValue()); } @Override diff --git a/core/java/android/view/DisplayInfo.java b/core/java/android/view/DisplayInfo.java index 7251b71ac35d3..913e5924c6a6d 100644 --- a/core/java/android/view/DisplayInfo.java +++ b/core/java/android/view/DisplayInfo.java @@ -31,9 +31,8 @@ import android.util.ArraySet; import android.util.DisplayMetrics; import android.util.proto.ProtoOutputStream; -import libcore.util.Objects; - import java.util.Arrays; +import java.util.Objects; /** * Describes the characteristics of a particular logical display. @@ -295,8 +294,8 @@ public final class DisplayInfo implements Parcelable { && layerStack == other.layerStack && flags == other.flags && type == other.type - && Objects.equal(address, other.address) - && Objects.equal(uniqueId, other.uniqueId) + && Objects.equals(address, other.address) + && Objects.equals(uniqueId, other.uniqueId) && appWidth == other.appWidth && appHeight == other.appHeight && smallestNominalAppWidth == other.smallestNominalAppWidth @@ -309,13 +308,13 @@ public final class DisplayInfo implements Parcelable { && overscanTop == other.overscanTop && overscanRight == other.overscanRight && overscanBottom == other.overscanBottom - && Objects.equal(displayCutout, other.displayCutout) + && Objects.equals(displayCutout, other.displayCutout) && rotation == other.rotation && modeId == other.modeId && defaultModeId == other.defaultModeId && colorMode == other.colorMode && Arrays.equals(supportedColorModes, other.supportedColorModes) - && Objects.equal(hdrCapabilities, other.hdrCapabilities) + && Objects.equals(hdrCapabilities, other.hdrCapabilities) && logicalDensityDpi == other.logicalDensityDpi && physicalXDpi == other.physicalXDpi && physicalYDpi == other.physicalYDpi @@ -323,7 +322,7 @@ public final class DisplayInfo implements Parcelable { && presentationDeadlineNanos == other.presentationDeadlineNanos && state == other.state && ownerUid == other.ownerUid - && Objects.equal(ownerPackageName, other.ownerPackageName) + && Objects.equals(ownerPackageName, other.ownerPackageName) && removeMode == other.removeMode; } diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java index a2c55b0918607..08513aa8682e5 100644 --- a/core/java/android/widget/RemoteViews.java +++ b/core/java/android/widget/RemoteViews.java @@ -69,8 +69,6 @@ import com.android.internal.R; import com.android.internal.util.NotificationColorUtil; import com.android.internal.util.Preconditions; -import libcore.util.Objects; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -82,6 +80,7 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import java.util.Objects; import java.util.Stack; import java.util.concurrent.Executor; @@ -291,9 +290,9 @@ public class RemoteViews implements Parcelable, Filter { return false; } MethodKey p = (MethodKey) o; - return Objects.equal(p.targetClass, targetClass) - && Objects.equal(p.paramClass, paramClass) - && Objects.equal(p.methodName, methodName); + return Objects.equals(p.targetClass, targetClass) + && Objects.equals(p.paramClass, paramClass) + && Objects.equals(p.methodName, methodName); } @Override diff --git a/core/java/com/android/internal/util/BitUtils.java b/core/java/com/android/internal/util/BitUtils.java index ba80aeae39e9d..17d5a2e36974b 100644 --- a/core/java/com/android/internal/util/BitUtils.java +++ b/core/java/com/android/internal/util/BitUtils.java @@ -20,10 +20,9 @@ package com.android.internal.util; import android.annotation.Nullable; import android.text.TextUtils; -import libcore.util.Objects; - import java.nio.ByteBuffer; import java.util.Arrays; +import java.util.Objects; import java.util.UUID; import java.util.function.IntFunction; @@ -56,7 +55,7 @@ public final class BitUtils { public static boolean maskedEquals(UUID a, UUID b, @Nullable UUID mask) { if (mask == null) { - return Objects.equal(a, b); + return Objects.equals(a, b); } return maskedEquals(a.getLeastSignificantBits(), b.getLeastSignificantBits(), mask.getLeastSignificantBits()) diff --git a/core/java/com/android/internal/widget/CachingIconView.java b/core/java/com/android/internal/widget/CachingIconView.java index b172dbc0d5bad..f3b6552be8ac9 100644 --- a/core/java/com/android/internal/widget/CachingIconView.java +++ b/core/java/com/android/internal/widget/CachingIconView.java @@ -30,7 +30,7 @@ import android.view.RemotableViewMethod; import android.widget.ImageView; import android.widget.RemoteViews; -import libcore.util.Objects; +import java.util.Objects; /** * An ImageView for displaying an Icon. Avoids reloading the Icon when possible. @@ -126,7 +126,7 @@ public class CachingIconView extends ImageView { boolean isCached = mLastResId != 0 && icon.getResId() == mLastResId - && Objects.equal(iconPackage, mLastPackage); + && Objects.equals(iconPackage, mLastPackage); mLastPackage = iconPackage; mLastResId = icon.getResId(); diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java index f158a65663f51..6d341c5607e25 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java @@ -51,7 +51,6 @@ import com.android.internal.util.ArrayUtils; import com.android.server.LocalServices; import libcore.io.IoUtils; -import libcore.util.Objects; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; @@ -66,6 +65,7 @@ import java.io.PrintWriter; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.Set; /** @@ -996,7 +996,7 @@ final class SettingsState { String defaultValue = this.defaultValue; boolean defaultFromSystem = this.defaultFromSystem; if (setDefault) { - if (!Objects.equal(value, this.defaultValue) + if (!Objects.equals(value, this.defaultValue) && (!defaultFromSystem || callerSystem)) { defaultValue = value; // Default null means no default, so the tag is irrelevant @@ -1015,10 +1015,10 @@ final class SettingsState { } // Is something gonna change? - if (Objects.equal(value, this.value) - && Objects.equal(defaultValue, this.defaultValue) - && Objects.equal(packageName, this.packageName) - && Objects.equal(tag, this.tag) + if (Objects.equals(value, this.value) + && Objects.equals(defaultValue, this.defaultValue) + && Objects.equals(packageName, this.packageName) + && Objects.equals(tag, this.tag) && defaultFromSystem == this.defaultFromSystem) { return false; } diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/CustomizeTileView.java b/packages/SystemUI/src/com/android/systemui/qs/customize/CustomizeTileView.java index b0806429df283..9759b6984d67a 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/customize/CustomizeTileView.java +++ b/packages/SystemUI/src/com/android/systemui/qs/customize/CustomizeTileView.java @@ -21,7 +21,7 @@ import android.widget.TextView; import com.android.systemui.R; import com.android.systemui.plugins.qs.QSIconView; import com.android.systemui.qs.tileimpl.QSTileView; -import libcore.util.Objects; +import java.util.Objects; public class CustomizeTileView extends QSTileView { @@ -45,7 +45,7 @@ public class CustomizeTileView extends QSTileView { } public void setAppLabel(CharSequence label) { - if (!Objects.equal(label, mAppLabel.getText())) { + if (!Objects.equals(label, mAppLabel.getText())) { mAppLabel.setText(label); } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java index b3244a5947df9..8d99303c7d514 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java @@ -44,7 +44,7 @@ import com.android.systemui.plugins.qs.QSTile.State; import com.android.systemui.qs.tileimpl.QSTileImpl; import com.android.systemui.qs.external.TileLifecycleManager.TileChangeListener; import com.android.systemui.qs.QSTileHost; -import libcore.util.Objects; +import java.util.Objects; import static android.view.Display.DEFAULT_DISPLAY; import static android.view.WindowManager.LayoutParams.TYPE_QS_DIALOG; @@ -140,7 +140,7 @@ public class CustomTile extends QSTileImpl implements TileChangeListener if (icon1.getResId() != icon2.getResId()) { return false; } - if (!Objects.equal(icon1.getResPackage(), icon2.getResPackage())) { + if (!Objects.equals(icon1.getResPackage(), icon2.getResPackage())) { return false; } return true; diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java b/packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java index 867f3b43d2af8..1170d7b6e8a94 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java +++ b/packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java @@ -39,8 +39,7 @@ import android.util.ArraySet; import android.util.Log; import com.android.systemui.qs.external.PackageManagerAdapter; -import libcore.util.Objects; - +import java.util.Objects; import java.util.Set; /** @@ -307,7 +306,7 @@ public class TileLifecycleManager extends BroadcastReceiver implements if (!Intent.ACTION_USER_UNLOCKED.equals(intent.getAction())) { Uri data = intent.getData(); String pkgName = data.getEncodedSchemeSpecificPart(); - if (!Objects.equal(pkgName, mIntent.getComponent().getPackageName())) { + if (!Objects.equals(pkgName, mIntent.getComponent().getPackageName())) { return; } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/TileServiceManager.java b/packages/SystemUI/src/com/android/systemui/qs/external/TileServiceManager.java index 342df5eff1fb0..7ad5a594565b3 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/external/TileServiceManager.java +++ b/packages/SystemUI/src/com/android/systemui/qs/external/TileServiceManager.java @@ -37,8 +37,7 @@ import com.android.systemui.qs.customize.TileQueryHelper.TileStateListener; import com.android.systemui.qs.external.TileLifecycleManager.TileChangeListener; import java.util.List; - -import libcore.util.Objects; +import java.util.Objects; /** * Manages the priority which lets {@link TileServices} make decisions about which tiles @@ -248,7 +247,7 @@ public class TileServiceManager { Uri data = intent.getData(); String pkgName = data.getEncodedSchemeSpecificPart(); final ComponentName component = mStateManager.getComponent(); - if (!Objects.equal(pkgName, component.getPackageName())) { + if (!Objects.equals(pkgName, component.getPackageName())) { return; } @@ -260,8 +259,8 @@ public class TileServiceManager { List services = pm.queryIntentServicesAsUser( queryIntent, 0, ActivityManager.getCurrentUser()); for (ResolveInfo info : services) { - if (Objects.equal(info.serviceInfo.packageName, component.getPackageName()) - && Objects.equal(info.serviceInfo.name, component.getClassName())) { + if (Objects.equals(info.serviceInfo.packageName, component.getPackageName()) + && Objects.equals(info.serviceInfo.name, component.getClassName())) { return; } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileView.java b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileView.java index 9eb9906ba3b5d..45c20a043ac96 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileView.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileView.java @@ -32,7 +32,7 @@ import com.android.systemui.R; import com.android.systemui.plugins.qs.QSIconView; import com.android.systemui.plugins.qs.QSTile; -import libcore.util.Objects; +import java.util.Objects; /** View that represents a standard quick settings tile. **/ public class QSTileView extends QSTileBaseView { @@ -98,7 +98,7 @@ public class QSTileView extends QSTileBaseView { @Override protected void handleStateChanged(QSTile.State state) { super.handleStateChanged(state); - if (!Objects.equal(mLabel.getText(), state.label) || mState != state.state) { + if (!Objects.equals(mLabel.getText(), state.label) || mState != state.state) { if (state.state == Tile.STATE_UNAVAILABLE) { int color = QSTileImpl.getColorForState(getContext(), state.state); state.label = new SpannableStringBuilder().append(state.label, @@ -108,7 +108,7 @@ public class QSTileView extends QSTileBaseView { mState = state.state; mLabel.setText(state.label); } - if (!Objects.equal(mSecondLine.getText(), state.secondaryLabel)) { + if (!Objects.equals(mSecondLine.getText(), state.secondaryLabel)) { mSecondLine.setText(state.secondaryLabel); mSecondLine.setVisibility(TextUtils.isEmpty(state.secondaryLabel) ? View.GONE : View.VISIBLE); diff --git a/packages/SystemUI/src/com/android/systemui/tuner/RadioListPreference.java b/packages/SystemUI/src/com/android/systemui/tuner/RadioListPreference.java index dc0d8bf6e668a..3a2a6c3c4b641 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/RadioListPreference.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/RadioListPreference.java @@ -33,7 +33,7 @@ import com.android.settingslib.Utils; import com.android.systemui.fragments.FragmentHostManager; import com.android.systemui.R; -import libcore.util.Objects; +import java.util.Objects; public class RadioListPreference extends CustomListPreference { @@ -124,7 +124,7 @@ public class RadioListPreference extends CustomListPreference { SelectablePreference pref = new SelectablePreference(context); getPreferenceScreen().addPreference(pref); pref.setTitle(entry); - pref.setChecked(Objects.equal(current, values[i])); + pref.setChecked(Objects.equals(current, values[i])); pref.setKey(String.valueOf(i)); } } 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 c50446514141f..d64244d8698b2 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.internal.R; 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 @@ final class FillUi { 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 6db3b44c17b28..349e1c8b713e3 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.DisplayCutout; 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 @@ final class DisplayDeviceInfo { 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 132f083c1adc3..e582fdf634720 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 android.view.Surface; 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 @@ final class LogicalDisplay { // 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 1af03de7de2f1..89cef621a55d5 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.ArrayList; 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 @@ final class PersistentDataStore { 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 08c0a1ad8219d..3293379339566 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.Surface; 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 @@ final class WifiDisplayAdapter extends DisplayAdapter { } 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 8932ca0cf85b2..fc59b5b0ffecc 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.NetworkInterface; 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 @@ final class WifiDisplayController implements DumpUtils.Dump { 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 dbccc0765b739..5292d3e5fd3b0 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.FileDescriptor; 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 @@ public final class DreamManagerService extends SystemService { 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 4050790c01e3b..a951d470735a1 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.HashMap; 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 @@ public class InputManagerService extends IInputManager.Stub 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 @@ public class InputManagerService extends IInputManager.Stub 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 372db416e7563..c9f8b20846976 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.Collections; 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 @@ final class PersistentDataStore { } public boolean setCurrentKeyboardLayout(String keyboardLayout) { - if (Objects.equal(mCurrentKeyboardLayout, keyboardLayout)) { + if (Objects.equals(mCurrentKeyboardLayout, keyboardLayout)) { return false; } addKeyboardLayout(keyboardLayout); @@ -432,7 +432,7 @@ final class PersistentDataStore { 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 a027fc6f2580a..43b17087953ae 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.ArrayMap; 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 class OverlayManagerServiceImpl { 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 @@ final class OverlayManagerServiceImpl { // 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 b7247df3b2a1a..c044c1ce814d2 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.internal.util.Preconditions; 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 org.xmlpull.v1.XmlSerializer; 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 @@ class ShortcutUser { 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 0eeaf661635db..de7e21acc5213 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.am.UserState; 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.ArrayList; import java.util.Collections; import java.util.LinkedList; import java.util.List; +import java.util.Objects; /** * Service for {@link UserManager}. @@ -604,7 +604,7 @@ public class UserManagerService extends IUserManager.Stub { 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 a4a0a54b39d12..e3e15907939ad 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.HashMap; 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 @@ public class PackageDexUsage extends AbstractStatsBase { // 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 @@ public class PackageDexUsage extends AbstractStatsBase { 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 38dc820e5b882..d67acc481acf5 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.lights.LightsManager; 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 final class PowerManagerService extends SystemService } public boolean hasSameWorkSource(WorkSource workSource) { - return Objects.equal(mWorkSource, workSource); + return Objects.equals(mWorkSource, workSource); } public void updateWorkSource(WorkSource workSource) {