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

Commit fc92e59c authored by Nathan Harold's avatar Nathan Harold
Browse files

Fix Issue Where SignalStrengthGsm is null 

Need to check for isEmpty() not null when determining
if SignalStrength needs a fixup.

Bug: 135492584
Test: atest RILTest#testFixupSignalStrength10
Merged-In: If140fe7a3521987ef2ab1db8d0a0326ac72d89cf
Change-Id: If140fe7a3521987ef2ab1db8d0a0326ac72d89cf
(cherry picked from commit 73c30705)
parent ad505a8f

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

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

                CellSignalStrengthGsm.class);

        // 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;

        }

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

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

        result = mRILUnderTest.fixupSignalStrength10(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