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

Commit 9e502e90 authored by satok's avatar satok Committed by Android Git Automerger
Browse files

am e5febfd5: Merge "Clean up the spell checker framework" into ics-mr1 

* commit 'e5febfd5':
  Clean up the spell checker framework
parents 8b9ba6fa e5febfd5

core/java/android/view/textservice/SpellCheckerSession.java

+2 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ public class SpellCheckerSession { 
        private static final int TASK_CLOSE = 3;

        private final Queue<SpellCheckerParams> mPendingTasks =

                new LinkedList<SpellCheckerParams>();

        private final Handler mHandler;

        private Handler mHandler;



        private boolean mOpened;

        private ISpellCheckerSession mISpellCheckerSession;
@@ -334,6 +334,7 @@ public class SpellCheckerSession { 
            try {

                mISpellCheckerSession.onClose();

                mISpellCheckerSession = null;

                mHandler = null;

            } catch (RemoteException e) {

                Log.e(TAG, "Failed to close " + e);

            }

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

+2 −4
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ public class TextServicesManagerService extends ITextServicesManager.Stub { 
        }

        final String sciId = info.getId();

        final InternalServiceConnection connection = new InternalServiceConnection(

                sciId, locale, scListener, bundle);

                sciId, locale, bundle);

        final Intent serviceIntent = new Intent(SpellCheckerService.SERVICE_INTERFACE);

        serviceIntent.setComponent(info.getComponent());

        if (DBG) {
@@ -704,15 +704,13 @@ public class TextServicesManagerService extends ITextServicesManager.Stub { 
    }



    private class InternalServiceConnection implements ServiceConnection {

        private final ISpellCheckerSessionListener mListener;

        private final String mSciId;

        private final String mLocale;

        private final Bundle mBundle;

        public InternalServiceConnection(

                String id, String locale, ISpellCheckerSessionListener listener, Bundle bundle) {

                String id, String locale, Bundle bundle) {

            mSciId = id;

            mLocale = locale;

            mListener = listener;

            mBundle = bundle;

        }