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

Author: satok16

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

@@ -201,7 +201,7 @@ private static class SpellCheckerSessionListenerImpl extends ISpellCheckerSessio
         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 @@ private void processClose() {
             try {
                 mISpellCheckerSession.onClose();
                 mISpellCheckerSession = null;
+                mHandler = null;
             } catch (RemoteException e) {
                 Log.e(TAG, "Failed to close " + e);
             }

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

@@ -360,7 +360,7 @@ private void startSpellCheckerServiceInnerLocked(SpellCheckerInfo info, String l
         }
         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 void removeAll() {
     }
 
     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;
         }