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

Commit 074637f1 authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Use Java7 diamond operator in TSMS. 

This CL changes nothing except for deleting redundant type parameters by
using diamond operator in TextServicesManagerService (TSMS).

No behavior change is intended.

Bug: 27456430
Change-Id: I18708fe44d2d9edfef8c1cf7cffef1bb0b5c003a
parent 77dd59fc

services/core/java/com/android/server/TextServicesManagerService.java

+6 −10
Original line number Original line Diff line number Diff line
@@ -76,11 +76,9 @@ public class TextServicesManagerService extends ITextServicesManager.Stub { 
    private final Context mContext;

    private final Context mContext;

    private boolean mSystemReady;

    private boolean mSystemReady;

    private final TextServicesMonitor mMonitor;

    private final TextServicesMonitor mMonitor;

    private final HashMap<String, SpellCheckerInfo> mSpellCheckerMap =

    private final HashMap<String, SpellCheckerInfo> mSpellCheckerMap = new HashMap<>();

            new HashMap<String, SpellCheckerInfo>();

    private final ArrayList<SpellCheckerInfo> mSpellCheckerList = new ArrayList<>();

    private final ArrayList<SpellCheckerInfo> mSpellCheckerList = new ArrayList<SpellCheckerInfo>();

    private final HashMap<String, SpellCheckerBindGroup> mSpellCheckerBindGroups = new HashMap<>();

    private final HashMap<String, SpellCheckerBindGroup> mSpellCheckerBindGroups =

            new HashMap<String, SpellCheckerBindGroup>();

    private final TextServicesSettings mSettings;

    private final TextServicesSettings mSettings;





    public void systemRunning() {

    public void systemRunning() {
@@ -615,8 +613,7 @@ public class TextServicesManagerService extends ITextServicesManager.Stub { 
            Slog.d(TAG, "FinishSpellCheckerService");

            Slog.d(TAG, "FinishSpellCheckerService");

        }

        }

        synchronized(mSpellCheckerMap) {

        synchronized(mSpellCheckerMap) {

            final ArrayList<SpellCheckerBindGroup> removeList =

            final ArrayList<SpellCheckerBindGroup> removeList = new ArrayList<>();

                    new ArrayList<SpellCheckerBindGroup>();

            for (SpellCheckerBindGroup group : mSpellCheckerBindGroups.values()) {

            for (SpellCheckerBindGroup group : mSpellCheckerBindGroups.values()) {

                if (group == null) continue;

                if (group == null) continue;

                // Use removeList to avoid modifying mSpellCheckerBindGroups in this loop.

                // Use removeList to avoid modifying mSpellCheckerBindGroups in this loop.
@@ -811,7 +808,7 @@ public class TextServicesManagerService extends ITextServicesManager.Stub { 
        private final String TAG = SpellCheckerBindGroup.class.getSimpleName();

        private final String TAG = SpellCheckerBindGroup.class.getSimpleName();

        private final InternalServiceConnection mInternalConnection;

        private final InternalServiceConnection mInternalConnection;

        private final CopyOnWriteArrayList<InternalDeathRecipient> mListeners =

        private final CopyOnWriteArrayList<InternalDeathRecipient> mListeners =

                new CopyOnWriteArrayList<InternalDeathRecipient>();

                new CopyOnWriteArrayList<>();

        public boolean mBound;

        public boolean mBound;

        public ISpellCheckerService mSpellChecker;

        public ISpellCheckerService mSpellChecker;

        public boolean mConnected;

        public boolean mConnected;
@@ -885,8 +882,7 @@ public class TextServicesManagerService extends ITextServicesManager.Stub { 
            }

            }

            synchronized(mSpellCheckerMap) {

            synchronized(mSpellCheckerMap) {

                final int size = mListeners.size();

                final int size = mListeners.size();

                final ArrayList<InternalDeathRecipient> removeList =

                final ArrayList<InternalDeathRecipient> removeList = new ArrayList<>();

                        new ArrayList<InternalDeathRecipient>();

                for (int i = 0; i < size; ++i) {

                for (int i = 0; i < size; ++i) {

                    final InternalDeathRecipient tempRecipient = mListeners.get(i);

                    final InternalDeathRecipient tempRecipient = mListeners.get(i);

                    if(tempRecipient.hasSpellCheckerListener(listener)) {

                    if(tempRecipient.hasSpellCheckerListener(listener)) {