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

Commit ee880fb2 authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

Merge "Convert unsigned uint8 fields in RIL interface to unsigned int." into oc-dev am: 091fd22c 

am: 4ccf19ce

Change-Id: If072df8b2720762c3c35071ed3591597edba0c16
parents 9c3c297d 4ccf19ce

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

+1 −1
Original line number Diff line number Diff line
@@ -4983,7 +4983,7 @@ public final class RIL extends BaseCommands implements CommandsInterface { 
    static ArrayList<Integer> convertHalLceData(LceDataInfo lce, RIL ril) {

        final ArrayList<Integer> capacityResponse = new ArrayList<Integer>();

        final int capacityDownKbps = lce.lastHopCapacityKbps;

        final int confidenceLevel = lce.confidenceLevel;

        final int confidenceLevel = Byte.toUnsignedInt(lce.confidenceLevel);

        final int lceSuspended = lce.lceSuspended ? 1 : 0;



        ril.riljLog("LCE capacity information received:" +

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

+1 −1
Original line number Diff line number Diff line
@@ -1739,7 +1739,7 @@ public class RadioResponse extends IRadioResponse.Stub { 
        if (rr != null) {

            ArrayList<Integer> ret = new ArrayList<Integer>();

            ret.add(statusInfo.lceStatus);

            ret.add((int) statusInfo.actualIntervalMs);

            ret.add(Byte.toUnsignedInt(statusInfo.actualIntervalMs));

            if (responseInfo.error == RadioError.NONE) {

                sendMessageResponse(rr.mResult, ret);

            }