From 801ade0f08364042a530c9f0530094c2bcc020f8 Mon Sep 17 00:00:00 2001
From: Joe Onorato <joeo@google.com>
Date: Mon, 15 Nov 2010 15:33:39 -0800
Subject: [PATCH] Don't crash if we haven't gotten a signal strength yet.

Bug: 3198447
Change-Id: I645b484eadfff6ed34517571b0c6fea3057ec563
---
 .../android/systemui/statusbar/policy/NetworkController.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
index f1b76f6cc7ebc..04f719500c4e7 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
@@ -321,7 +321,9 @@ public class NetworkController extends BroadcastReceiver {
                 mPhoneSignalIconId = R.drawable.stat_sys_signal_null;
             }
         } else {
-            if (isCdma()) {
+            if (mSignalStrength == null) {
+                mPhoneSignalIconId = R.drawable.stat_sys_signal_null;
+            } else if (isCdma()) {
                 // If 3G(EV) and 1x network are available than 3G should be
                 // displayed, displayed RSSI should be from the EV side.
                 // If a voice call is made then RSSI should switch to 1x.