am 350b7829: Merge "Fix NPE in the statusbar." into honeycomb-LTE (31ced5c1) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java

+9 −7

Original line number	Diff line number	Diff line
		@@ -446,6 +446,7 @@ public class NetworkController extends BroadcastReceiver {
		}

		boolean isCdmaEri() {
		if (mServiceState != null) {
		final int iconIndex = mServiceState.getCdmaEriIconIndex();
		if (iconIndex != EriInfo.ROAMING_INDICATOR_OFF) {
		final int iconMode = mServiceState.getCdmaEriIconMode();
		@@ -454,6 +455,7 @@ public class NetworkController extends BroadcastReceiver {
		return true;
		}
		}
		}
		return false;
		}

		@@ -854,7 +856,7 @@ public class NetworkController extends BroadcastReceiver {
		pw.print(" mDataActivity=");
		pw.println(mDataActivity);
		pw.print(" mServiceState=");
		pw.println(mServiceState.toString());
		pw.println(mServiceState);
		pw.print(" mNetworkName=");
		pw.println(mNetworkName);
		pw.print(" mNetworkNameDefault=");