Merge with 63eb7915dafe329e8f06cc33c56122ee15ea6df7

This commit is contained in:
Bartlomiej Niechwiej
2010-11-17 22:20:15 -08:00
7 changed files with 66 additions and 27 deletions
@@ -261,7 +261,9 @@ public class StatusAnnouncerTask implements PeriodicTask {
protected void listenToPhoneState(PhoneStateListener listener, int events) {
TelephonyManager telephony =
(TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
telephony.listen(listener, events);
if (telephony != null) {
telephony.listen(listener, events);
}
}
/**