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

Commit 4069daa9 authored by Nathan Harold's avatar Nathan Harold Committed by Gerrit Code Review
Browse files

Merge "Fix Issue Where SignalStrengthGsm is null"

parents 9d0f5039 73c30705

src/java/com/android/internal/telephony/RIL.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -5870,7 +5870,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
        List<CellSignalStrengthGsm> gsmList = signalStrength.getCellSignalStrengths(

        List<CellSignalStrengthGsm> gsmList = signalStrength.getCellSignalStrengths(

                CellSignalStrengthGsm.class);

                CellSignalStrengthGsm.class);

        // If GSM is not the primary type, then bail out; no fixup needed.

        // If GSM is not the primary type, then bail out; no fixup needed.

        if (gsmList == null || gsmList.get(0) == null || !gsmList.get(0).isValid()) {

        if (gsmList.isEmpty() || !gsmList.get(0).isValid()) {

            return signalStrength;

            return signalStrength;

        }

        }

tests/telephonytests/src/com/android/internal/telephony/RILTest.java

+11 −0
Original line number Original line Diff line number Diff line
@@ -1865,6 +1865,17 @@ public class RILTest extends TelephonyTest { 
                .when(mServiceState).getRilVoiceRadioTechnology();

                .when(mServiceState).getRilVoiceRadioTechnology();

        result = mRILUnderTest.fixupSignalStrength10(gsmSignalStrength);

        result = mRILUnderTest.fixupSignalStrength10(gsmSignalStrength);

        assertEquals(result, gsmSignalStrength);

        assertEquals(result, gsmSignalStrength);



        // Check that non-GSM non-WCDMA signal strengths are also passed through.

        SignalStrength lteSignalStrength = new SignalStrength(

                new CellSignalStrengthCdma(), new CellSignalStrengthGsm(),

                new CellSignalStrengthWcdma(), new CellSignalStrengthTdscdma(),

                new CellSignalStrengthLte(CellInfo.UNAVAILABLE,

                        -120, -10, CellInfo.UNAVAILABLE, CellInfo.UNAVAILABLE,

                        CellInfo.UNAVAILABLE), new CellSignalStrengthNr());

        SignalStrength lteResult = mRILUnderTest.fixupSignalStrength10(lteSignalStrength);



        assertEquals(lteResult, lteSignalStrength);

    }

    }





    @Test

    @Test