no bug - fix crashing when we unregister an sms handler that isn't registered r=dougt

This commit is contained in:
Brad Lassey 2011-11-30 01:57:04 -05:00
Родитель 515ffb4b4b
Коммит 491f40f206
1 изменённых файлов: 5 добавлений и 3 удалений

Просмотреть файл

@ -113,6 +113,7 @@ abstract public class GeckoApp
private IntentFilter mConnectivityFilter; private IntentFilter mConnectivityFilter;
private IntentFilter mBatteryFilter; private IntentFilter mBatteryFilter;
private IntentFilter mSmsFilter;
private BroadcastReceiver mConnectivityReceiver; private BroadcastReceiver mConnectivityReceiver;
private BroadcastReceiver mSmsReceiver; private BroadcastReceiver mSmsReceiver;
@ -1377,10 +1378,10 @@ abstract public class GeckoApp
mBatteryReceiver = new GeckoBatteryManager(); mBatteryReceiver = new GeckoBatteryManager();
registerReceiver(mBatteryReceiver, batteryFilter); registerReceiver(mBatteryReceiver, batteryFilter);
IntentFilter smsFilter = new IntentFilter(); mSmsFilter = new IntentFilter();
smsFilter.addAction("android.provider.Telephony.SMS_RECEIVED"); mSmsFilter.addAction("android.provider.Telephony.SMS_RECEIVED");
mSmsReceiver = new GeckoSmsManager(); mSmsReceiver = new GeckoSmsManager();
registerReceiver(mSmsReceiver, smsFilter); registerReceiver(mSmsReceiver, mSmsFilter);
final GeckoApp self = this; final GeckoApp self = this;
@ -1511,6 +1512,7 @@ abstract public class GeckoApp
if (checkLaunchState(LaunchState.Launching)) if (checkLaunchState(LaunchState.Launching))
onNewIntent(getIntent()); onNewIntent(getIntent());
registerReceiver(mSmsReceiver, mSmsFilter);
registerReceiver(mConnectivityReceiver, mConnectivityFilter); registerReceiver(mConnectivityReceiver, mConnectivityFilter);
} }