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

Commit c941fedf authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Use java.util.Objects

This is a follow up CL for I451544fba746a76618.

This CL replaces libcore.util.Objects with java.util.Objects as
java.util.Objects is getting more and more widely used in
Android. There should be no behavioural change anyway.

Change-Id: Id9568ee98aa3845588017c3711e7d03a3481beea
parent d6f4e375
Loading
Loading
Loading
Loading
+3 −4
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ import com.android.internal.view.IInputMethodManager;
import com.android.internal.view.IInputMethodSession;
import com.android.internal.view.InputBindResult;

import libcore.util.Objects;

import android.content.Context;
import android.graphics.Rect;
import android.inputmethodservice.InputMethodService;
@@ -58,6 +56,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;

@@ -1550,7 +1549,7 @@ public final class InputMethodManager {
            }
            if (DEBUG) Log.d(TAG, "updateCursor");
            mTmpCursorRect.set(left, top, right, bottom);
            if (!Objects.equal(mCursorRect, mTmpCursorRect)) {
            if (!Objects.equals(mCursorRect, mTmpCursorRect)) {
                try {
                    if (DEBUG) Log.v(TAG, "CURSOR CHANGE: " + mCurMethod);
                    mCursorRect.set(mTmpCursorRect);
@@ -1581,7 +1580,7 @@ public final class InputMethodManager {
                    || mCurrentTextBoxAttribute == null || mCurMethod == null) {
                return;
            }
            if (Objects.equal(mCursorAnchorInfo, cursorAnchorInfo)) {
            if (Objects.equals(mCursorAnchorInfo, cursorAnchorInfo)) {
                Log.w(TAG, "Ignoring redundant updateCursorAnchorInfo: info=" + cursorAnchorInfo);
                return;
            }