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

Commit 4b8f9e2b authored by Rambo Wang's avatar Rambo Wang Committed by Automerger Merge Worker
Browse files

Merge "Move signal strength logic from ServiceStateTracker to... 

Merge "Move signal strength logic from ServiceStateTracker to SignalStrengthController" am: e8b41f10

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

Change-Id: I1279e908f86228257b94a598f6337ad74aaa6d00
parents 6258068a e8b41f10

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

+3 −3
Original line number Diff line number Diff line
@@ -2198,11 +2198,11 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
     * @return Current signal strength as SignalStrength

     */

    public SignalStrength getSignalStrength() {

        ServiceStateTracker sst = getServiceStateTracker();

        if (sst == null) {

        SignalStrengthController ssc = getSignalStrengthController();

        if (ssc == null) {

            return new SignalStrength();

        } else {

            return sst.getSignalStrength();

            return ssc.getSignalStrength();

        }

    }