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

Commit abe63702 authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge "Added bands from HAL 1.5" am: 91409817 am: 9ddd49a5 

Change-Id: I4beac3d26c40289fe9f8a42f70cf7cbf14b85ce4
parents 300a9571 9ddd49a5

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

+3 −2
Original line number Diff line number Diff line
@@ -642,8 +642,9 @@ public class NetworkMonitorTest { 
            int bandwidth, String mccStr, String mncStr, String alphal, String alphas)

            throws ReflectiveOperationException {

        if (ShimUtils.isReleaseOrDevelopmentApiAbove(Build.VERSION_CODES.Q)) {

            return new CellIdentityLte(ci, pci, tac, earfcn, bandwidth, mccStr, mncStr, alphal,

                    alphas, Collections.emptyList() /* additionalPlmns */, null /* csgInfo */);

            return new CellIdentityLte(ci, pci, tac, earfcn, Collections.emptyList() /* bands */,

                    bandwidth, mccStr, mncStr, alphal, alphas,

                    Collections.emptyList() /* additionalPlmns */, null /* csgInfo */);

        } else {

            // API <= Q does not have the additionalPlmns and csgInfo parameters

            final Constructor<CellIdentityLte> constructor = CellIdentityLte.class.getConstructor(