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

Commit 0d7f9c59 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix converting method for TrafficDescriptor" am: 82442012 am: 59e80054 am: cbe64a8d 

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

Change-Id: I4df31199624f4fc1b4288abfbb337d5f7d2a4171
parents e89aa554 cbe64a8d

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

+1 −1
Original line number Diff line number Diff line
@@ -1106,7 +1106,7 @@ public class RILUtils { 
    public static android.hardware.radio.data.TrafficDescriptor

            convertToHalTrafficDescriptorAidl(@Nullable TrafficDescriptor trafficDescriptor) {

        if (trafficDescriptor == null) {

            return null;

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

        }



        android.hardware.radio.data.TrafficDescriptor td =