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

Commit 9bd04846 authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Add a null check to prevent NullPointerException am: 10039a47 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11702815

Change-Id: Ibf5e1da70457d200a238a7b71de487fed0aa98a5
parents c9f0224c 10039a47

src/com/android/server/connectivity/NetworkMonitor.java

+1 −0
Original line number Diff line number Diff line
@@ -1731,6 +1731,7 @@ public class NetworkMonitor extends StateMachine { 
        }

        try {

            final List<CellInfo> cells = mTelephonyManager.getAllCellInfo();

            if (cells == null) return null;

            final Map<String, Integer> countryCodeMap = new HashMap<>();

            int maxCount = 0;

            for (final CellInfo cell : cells) {

tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java

+4 −1
Original line number Diff line number Diff line
@@ -866,12 +866,15 @@ public class NetworkMonitorTest { 
        doReturn(PackageManager.PERMISSION_GRANTED).when(mContext).checkPermission(

                eq(android.Manifest.permission.ACCESS_FINE_LOCATION),  anyInt(), anyInt());

        doReturn(new ContextWrapper(mContext)).when(mContext).createConfigurationContext(any());

        doReturn(null).when(mTelephony).getAllCellInfo();

        assertNull(wnm.getLocationMcc());

        // Prepare CellInfo and check if the vote mechanism is working or not.

        final List<CellInfo> cellList = new ArrayList<CellInfo>();

        doReturn(cellList).when(mTelephony).getAllCellInfo();

        assertNull(wnm.getLocationMcc());

        cellList.add(makeTestCellInfoGsm("460"));

        cellList.add(makeTestCellInfoGsm("460"));

        cellList.add(makeTestCellInfoLte("466"));

        doReturn(cellList).when(mTelephony).getAllCellInfo();

        // The count of 460 is 2 and the count of 466 is 1, so the getLocationMcc() should return

        // 460.

        assertEquals("460", wnm.getLocationMcc());