am 999d483b: am 49a8bbf4: Don\'t crash if we\'ve never gotten a signal strength update.

Merge commit '999d483bf8fc4271c42484aaf253f12e4eb8ff29'

* commit '999d483bf8fc4271c42484aaf253f12e4eb8ff29':
  Don't crash if we've never gotten a signal strength update.
This commit is contained in:
Joe Onorato
2010-09-23 10:50:54 -07:00
committed by Android Git Automerger

View File

@@ -844,7 +844,7 @@ public class StatusBarPolicy {
int[] iconList;
// Display signal strength while in "emergency calls only" mode
if (!hasService() && !mServiceState.isEmergencyOnly()) {
if (mServiceState == null || (!hasService() && !mServiceState.isEmergencyOnly())) {
//Slog.d(TAG, "updateSignalStrength: no service");
if (Settings.System.getInt(mContext.getContentResolver(),
Settings.System.AIRPLANE_MODE_ON, 0) == 1) {