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

Commit 236510ce authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Correct conversion for TrafficDescriptor" am: 6fb35e70 am: 9e3ebad7 

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

Change-Id: Ia9ddbfd2f1cb49c0f98bea37c9fe42ef9b2f925a
parents 1298671d 9e3ebad7

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

+7 −3
Original line number Diff line number Diff line
@@ -1099,9 +1099,13 @@ public class RILUtils { 
        android.hardware.radio.data.TrafficDescriptor td =

                new android.hardware.radio.data.TrafficDescriptor();

        td.dnn = trafficDescriptor.getDataNetworkName();

        if (trafficDescriptor.getOsAppId() == null) {

            td.osAppId = null;

        } else {

            android.hardware.radio.data.OsAppId osAppId = new android.hardware.radio.data.OsAppId();

            osAppId.osAppId = trafficDescriptor.getOsAppId();

            td.osAppId = osAppId;

        }

        return td;

    }