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

Commit 61c4993f authored by Rambo Wang's avatar Rambo Wang Committed by Automerger Merge Worker
Browse files

Merge "Rename SignalThresholdInfo.Builder#setThresholdUnlimited" am: c1e14ef1 am: 079d6954 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1567782

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0f372f8571e2c8f58b52fb5e1ec4eb04fc42c29c
parents 2aa2c23e 079d6954

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

+1 −1
Original line number Diff line number Diff line
@@ -4077,7 +4077,7 @@ public class GsmCdmaPhone extends Phone { 
                        .setSignalMeasurementType(signalStrengthMeasure)

                        .setHysteresisMs(REPORTING_HYSTERESIS_MILLIS)

                        .setHysteresisDb(REPORTING_HYSTERESIS_DB)

                        .setThresholdsUnlimited(consolidatedThresholds)

                        .setThresholds(consolidatedThresholds, true /*isSystem*/)

                        .setIsEnabled(isEnabled)

                        .build(),

                ran, null);

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

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ public class SignalThresholdInfoTest extends TestCase { 
                .setSignalMeasurementType(SignalThresholdInfo.SIGNAL_MEASUREMENT_TYPE_RSSI)

                .setHysteresisMs(0)

                .setHysteresisDb(0)

                .setThresholdsUnlimited(new int[]{})

                .setThresholds(new int[]{}, true /*isSystem*/)

                .setIsEnabled(false)

                .build());

        stList.add(new SignalThresholdInfo.Builder()