commit 7ff49b3ad667a33bbe0f445fda99fe62749b3b90
author Yohei Yukawa <yukawa@google.com> Wed May 14 10:45:54 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 14 10:45:54 2014 +0000
tree cc84134ce4e07cb557846d36ee482b5c7a641c84
parent cd10d7c5950d979ac0bdca4e0a3635f951445fb4
parent c941fedf506aa48445999c4b20a8ea8ecdcc6991

Merge "Use java.util.Objects"

core/java/android/view/inputmethod/InputMethodManager.java

diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java
index 3fee0ac..f874eb7 100644
--- a/core/java/android/view/inputmethod/InputMethodManager.java
+++ b/core/java/android/view/inputmethod/InputMethodManager.java
@@ -24,8 +24,6 @@
 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.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 @@
             }
             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 @@
                     || mCurrentTextBoxAttribute == null || mCurMethod == null) {
                 return;
             }
-            if (Objects.equal(mCursorAnchorInfo, cursorAnchorInfo)) {
+            if (Objects.equals(mCursorAnchorInfo, cursorAnchorInfo)) {
                 Log.w(TAG, "Ignoring redundant updateCursorAnchorInfo: info=" + cursorAnchorInfo);
                 return;
             }