aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-04-16 03:18:14 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-16 03:18:14 +0000
commite2fba0d64b4b612a73ded8534f7409082e4250e3 (patch)
treebd1f717a69b525bc7a85aa125c51dd75e3a921de
parente66818da27f90558217970333b0304bde8122cc6 (diff)
parent66e509b1d4a8f41a7e4d6e26dfa0dd9995e945a9 (diff)
downloadlatinime-e2fba0d64b4b612a73ded8534f7409082e4250e3.tar.gz
latinime-e2fba0d64b4b612a73ded8534f7409082e4250e3.tar.xz
latinime-e2fba0d64b4b612a73ded8534f7409082e4250e3.zip
am 66e509b1: Fix some failing tests
* commit '66e509b1d4a8f41a7e4d6e26dfa0dd9995e945a9': Fix some failing tests
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 1fdb8d16c..2a67cb2a1 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -501,7 +501,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
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 class LatinIME extends InputMethodService implements KeyboardActionListen
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 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
@UsedForTesting
public void recycle() {
+ unregisterReceiver(mDictionaryPackInstallReceiver);
+ unregisterReceiver(mDictionaryDumpBroadcastReceiver);
+ unregisterReceiver(mConnectivityAndRingerModeChangeReceiver);
mInputLogic.recycle();
}
@@ -1635,7 +1638,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// 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();