commit 66e509b1d4a8f41a7e4d6e26dfa0dd9995e945a9
author Jean Chalard <jchalard@google.com> Tue Apr 15 19:23:01 2014 +0900
committer Jean Chalard <jchalard@google.com> Tue Apr 15 21:44:46 2014 +0900
tree bd1f717a69b525bc7a85aa125c51dd75e3a921de
parent 1ee443d848f7e8ce8b3696e4d6e4a6afa1ce2d47

Fix some failing tests

Bug: 13968927
Change-Id: I7e5e075535e38bf0fa24af98ed6e2cdfd6de6556

java/src/com/android/inputmethod/latin/LatinIME.java

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 1fdb8d1..2a67cb2 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -501,7 +501,7 @@
         final IntentFilter filter = new IntentFilter();
         filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
         filter.addAction(AudioManager.RINGER_MODE_CHANGED_ACTION);
-        registerReceiver(mReceiver, filter);
+        registerReceiver(mConnectivityAndRingerModeChangeReceiver, filter);
 
         final IntentFilter packageFilter = new IntentFilter();
         packageFilter.addAction(Intent.ACTION_PACKAGE_ADDED);
@@ -630,7 +630,7 @@
     public void onDestroy() {
         mInputLogic.mSuggest.mDictionaryFacilitator.closeDictionaries();
         mSettings.onDestroy();
-        unregisterReceiver(mReceiver);
+        unregisterReceiver(mConnectivityAndRingerModeChangeReceiver);
         if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
             ResearchLogger.getInstance().onDestroy();
         }
@@ -645,6 +645,9 @@
 
     @UsedForTesting
     public void recycle() {
+        unregisterReceiver(mDictionaryPackInstallReceiver);
+        unregisterReceiver(mDictionaryDumpBroadcastReceiver);
+        unregisterReceiver(mConnectivityAndRingerModeChangeReceiver);
         mInputLogic.recycle();
     }
 
@@ -1635,7 +1638,7 @@
     // boolean onKeyMultiple(final int keyCode, final int count, final KeyEvent event);
 
     // receive ringer mode change and network state change.
-    private BroadcastReceiver mReceiver = new BroadcastReceiver() {
+    private BroadcastReceiver mConnectivityAndRingerModeChangeReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(final Context context, final Intent intent) {
             final String action = intent.getAction();