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

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

Merge "When UUS info is null, set array size 0." am: 8a552e0d am: e00e4664 am: 34c95a9f 

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

Change-Id: I6ad861a37a99f2be72678c00eeda2f27fad8a5e0
parents 271ce6f8 34c95a9f

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

+2 −0
Original line number Diff line number Diff line
@@ -1883,6 +1883,8 @@ public class RILUtils { 
            info.uusDcs = uusInfo.getDcs();

            info.uusData = new String(uusInfo.getUserData());

            dial.uusInfo = new android.hardware.radio.voice.UusInfo[] {info};

        } else {

            dial.uusInfo = new android.hardware.radio.voice.UusInfo[0];

        }

        return dial;

    }