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

Commit fc892559 authored by Nathan Harold's avatar Nathan Harold Committed by nharold
Browse files

Cleanup of SignalStrength Parcel 

Remove extraneous constructors from SignalStrength.
Add tests for SignalStrength to verify parceling.

Bug: 72116430
Test: runtest frameworks-telephony
Change-Id: I542450d825763290b2f9deeab4405465a9944d94
parent 5d5800c4

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

+1 −2
Original line number Diff line number Diff line
@@ -5261,7 +5261,6 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                signalStrength.lte.rsrq,

                signalStrength.lte.rssnr,

                signalStrength.lte.cqi,

                signalStrength.tdScdma.rscp,

                false /* gsmFlag - don't care; will be changed by SST */);

                signalStrength.tdScdma.rscp);

    }

}

src/java/com/android/internal/telephony/test/SimulatedCommands.java

+2 −4
Original line number Diff line number Diff line
@@ -863,8 +863,7 @@ public class SimulatedCommands extends BaseCommands 
                SignalStrength.INVALID,     // lteRsrq

                SignalStrength.INVALID,     // lteRssnr

                SignalStrength.INVALID,     // lteCqi

                SignalStrength.INVALID,     // tdScdmaRscp

                true                        // gsmFlag

                SignalStrength.INVALID      // tdScdmaRscp

            );

        }
@@ -2107,8 +2106,7 @@ public class SimulatedCommands extends BaseCommands 
                    SignalStrength.INVALID,     // lteRsrq

                    SignalStrength.INVALID,     // lteRssnr

                    SignalStrength.INVALID,     // lteCqi

                    SignalStrength.INVALID,     // tdScdmaRscp

                    true                        // gsmFlag

                    SignalStrength.INVALID      // tdScdmaRscp

            );

        }

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

+1 −2
Original line number Diff line number Diff line
@@ -374,8 +374,7 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
                SignalStrength.INVALID,     // lteRsrq

                SignalStrength.INVALID,     // lteRssnr

                SignalStrength.INVALID,     // lteCqi

                SignalStrength.INVALID,     // tdScdmaRscp

                true                        // gsmFlag

                SignalStrength.INVALID      // tdScdmaRscp

        );



        mSimulatedCommands.setSignalStrength(ss);

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

0 → 100644
+80 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.internal.telephony;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertTrue;



import android.os.Parcel;

import android.support.test.filters.SmallTest;

import android.telephony.SignalStrength;



import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runners.JUnit4;



/** Unit tests for {@link IpSecConfig}. */

@SmallTest

@RunWith(JUnit4.class)

public class SignalStrengthTest {



    @Test

    public void testDefaults() throws Exception {

        SignalStrength s = new SignalStrength();

        assertEquals(-1, s.getCdmaDbm());

        assertEquals(-1, s.getCdmaEcio());

        assertEquals(-1, s.getEvdoDbm());

        assertEquals(-1, s.getEvdoEcio());

        assertEquals(-1, s.getEvdoSnr());

        assertEquals(-1, s.getGsmBitErrorRate());

        assertEquals(99, s.getGsmSignalStrength());

        assertEquals(true, s.isGsm());

    }



    @Test

    public void testParcelUnparcel() throws Exception {

        assertParcelingIsLossless(new SignalStrength());



        SignalStrength s = new SignalStrength(

                20,    // gsmSignalStrength

                5,     // gsmBitErrorRate

                -95,   // cdmaDbm

                10,    // cdmaEcio

                -98,   // evdoDbm

                -5,    // evdoEcio

                -2,    // evdoSnr

                45,    // lteSignalStrength

                -105,  // lteRsrp

                -110,  // lteRsrq

                -115,  // lteRssnr

                13,    // lteCqi

                -90,   // tdscdmaRscp

                2,     // lteRsrpBoost

                false, // gsmFlag

                true); // lteLevelBaseOnRsrp

        assertParcelingIsLossless(s);

    }



    private void assertParcelingIsLossless(SignalStrength ssi) throws Exception {

        Parcel p = Parcel.obtain();

        ssi.writeToParcel(p, 0);

        p.setDataPosition(0);

        SignalStrength sso = SignalStrength.CREATOR.createFromParcel(p);

        assertTrue(sso.equals(ssi));

    }

}