nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

am 66e509b1: Fix some failing tests

Browse source 
* commit '66e509b1d4a8f41a7e4d6e26dfa0dd9995e945a9':
  Fix some failing tests
This commit is contained in:
Jean Chalard 2014-04-16 03:18:14 +00:00 committed by Android Git Automerger
commit e2fba0d64b
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
java/src/com/android/inputmethod/latin/LatinIME.java
View file

@ -501,7 +501,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
final IntentFilter filter = new IntentFilter(); final IntentFilter filter = new IntentFilter();
filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION); filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
filter.addAction(AudioManager.RINGER_MODE_CHANGED_ACTION); filter.addAction(AudioManager.RINGER_MODE_CHANGED_ACTION);
registerReceiver(mReceiver, filter); registerReceiver(mConnectivityAndRingerModeChangeReceiver, filter);
final IntentFilter packageFilter = new IntentFilter(); final IntentFilter packageFilter = new IntentFilter();
packageFilter.addAction(Intent.ACTION_PACKAGE_ADDED); packageFilter.addAction(Intent.ACTION_PACKAGE_ADDED);
@ -630,7 +630,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
public void onDestroy() { public void onDestroy() {
mInputLogic.mSuggest.mDictionaryFacilitator.closeDictionaries(); mInputLogic.mSuggest.mDictionaryFacilitator.closeDictionaries();
mSettings.onDestroy(); mSettings.onDestroy();
unregisterReceiver(mReceiver); unregisterReceiver(mConnectivityAndRingerModeChangeReceiver);
if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) { if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
ResearchLogger.getInstance().onDestroy(); ResearchLogger.getInstance().onDestroy();
} }
@ -645,6 +645,9 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
@UsedForTesting @UsedForTesting
public void recycle() { public void recycle() {
unregisterReceiver(mDictionaryPackInstallReceiver);
unregisterReceiver(mDictionaryDumpBroadcastReceiver);
unregisterReceiver(mConnectivityAndRingerModeChangeReceiver);
mInputLogic.recycle(); mInputLogic.recycle();
} }
@ -1635,7 +1638,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// boolean onKeyMultiple(final int keyCode, final int count, final KeyEvent event); // boolean onKeyMultiple(final int keyCode, final int count, final KeyEvent event);
// receive ringer mode change and network state change. // receive ringer mode change and network state change.
private BroadcastReceiver mReceiver = new BroadcastReceiver() { private BroadcastReceiver mConnectivityAndRingerModeChangeReceiver = new BroadcastReceiver() {
@Override @Override
public void onReceive(final Context context, final Intent intent) { public void onReceive(final Context context, final Intent intent) {
final String action = intent.getAction(); final String action = intent.getAction();