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

Commit 5a3e91f8 authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

DO NOT MERGE 

backport of change 113518 from honeycomb-LTE.  Fixes NPE in the
statusbar.

bug:4518551
Change-Id: I9a85e6799d12052e7bc8c54d651bee789d885a2f
parent 8e18668d

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

+9 −7
Original line number Diff line number Diff line
@@ -442,6 +442,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();
@@ -450,6 +451,7 @@ public class NetworkController extends BroadcastReceiver { 
                    return true;

                }

            }

        }

        return false;

    }
@@ -850,7 +852,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=");