Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 350b7829 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in the statusbar." into honeycomb-LTE

parents fd324486 acab04df

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=");