diff options
| author | Yohei Yukawa <yukawa@google.com> | 2014-05-14 19:33:35 +0900 |
|---|---|---|
| committer | Yohei Yukawa <yukawa@google.com> | 2014-05-14 19:38:07 +0900 |
| commit | c941fedf506aa48445999c4b20a8ea8ecdcc6991 (patch) | |
| tree | ae16fffdef64219fea340c3939d966fa6029a9c7 | |
| parent | d6f4e37554398b46e84485707d114b5b1a408a8a (diff) | |
| download | frameworks_base-c941fedf506aa48445999c4b20a8ea8ecdcc6991.zip frameworks_base-c941fedf506aa48445999c4b20a8ea8ecdcc6991.tar.gz frameworks_base-c941fedf506aa48445999c4b20a8ea8ecdcc6991.tar.bz2 | |
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
| -rw-r--r-- | core/java/android/view/inputmethod/InputMethodManager.java | 7 |
1 files changed, 3 insertions, 4 deletions
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.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; } |