summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/view/inputmethod/InputMethodManager.java9
1 files changed, 4 insertions, 5 deletions
diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java
index 293fcf8d29d0..ee0680689412 100644
--- a/core/java/android/view/inputmethod/InputMethodManager.java
+++ b/core/java/android/view/inputmethod/InputMethodManager.java
@@ -376,8 +376,8 @@ public final class InputMethodManager {
*/
private int mRequestUpdateCursorAnchorInfoMonitorMode = REQUEST_UPDATE_CURSOR_ANCHOR_INFO_NONE;
- final Pool<PendingEvent> mPendingEventPool = new SimplePool<PendingEvent>(20);
- final SparseArray<PendingEvent> mPendingEvents = new SparseArray<PendingEvent>(20);
+ final Pool<PendingEvent> mPendingEventPool = new SimplePool<>(20);
+ final SparseArray<PendingEvent> mPendingEvents = new SparseArray<>(20);
// -----------------------------------------------------------
@@ -2032,8 +2032,7 @@ public final class InputMethodManager {
*/
public Map<InputMethodInfo, List<InputMethodSubtype>> getShortcutInputMethodsAndSubtypes() {
synchronized (mH) {
- HashMap<InputMethodInfo, List<InputMethodSubtype>> ret =
- new HashMap<InputMethodInfo, List<InputMethodSubtype>>();
+ HashMap<InputMethodInfo, List<InputMethodSubtype>> ret = new HashMap<>();
try {
// TODO: We should change the return type from List<Object> to List<Parcelable>
List<Object> info = mService.getShortcutInputMethodsAndSubtypes();
@@ -2048,7 +2047,7 @@ public final class InputMethodManager {
Log.e(TAG, "IMI list already contains the same InputMethod.");
break;
}
- subtypes = new ArrayList<InputMethodSubtype>();
+ subtypes = new ArrayList<>();
ret.put((InputMethodInfo)o, subtypes);
} else if (subtypes != null && o instanceof InputMethodSubtype) {
subtypes.add((InputMethodSubtype)o);