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

Commit 655c8f41 authored by Maciej Żenczykowski's avatar Maciej Żenczykowski Committed by Automerger Merge Worker
Browse files

Merge "Fixing typo" into main am: c3d7a713 am: 9b769338 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2957034



Change-Id: I6971792cbd5318fa2692a7f9e692ff1a07d15f0c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e49e44cb 9b769338

core/tests/BroadcastRadioTests/src/android/hardware/radio/TunerAdapterTest.java

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ public final class TunerAdapterTest { 
        int scanStatus = mRadioTuner.scan(RadioTuner.DIRECTION_DOWN, /* skipSubChannel= */ false);



        verify(mTunerMock).seek(/* directionDown= */ true, /* skipSubChannel= */ false);

        assertWithMessage("Status for scaning")

        assertWithMessage("Status for scanning")

                .that(scanStatus).isEqualTo(RadioManager.STATUS_OK);

        verify(mCallbackMock, timeout(CALLBACK_TIMEOUT_MS)).onProgramInfoChanged(FM_PROGRAM_INFO);

    }

core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerStressTestRunner.java

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ public class ConnectivityManagerStressTestRunner extends InstrumentationTestRunn 
        }

    }



    public int getSoftApInterations() {

    public int getSoftApIterations() {

        return mSoftApIterations;

    }