commit fee15e83fd7c92eee8235b5a85b4a6936a079d97
author Tim Lin <timtmlin@google.com> Wed Dec 29 13:22:37 2021 +0800
committer Tim Lin <timtmlin@google.com> Thu Jan 06 19:19:11 2022 +0800
tree 10edebb8df5c1ceb774d9ea4a45a84ade6d4eb4c
parent ab6b67eaccb38ccc03fa54734653af6d36f8e2e8

Correct conversion for TrafficDescriptor

Bug: 212328322
Test: CF boot and check setup_data_call request.
Change-Id: I2b41242c9f1e997ceb26d61b893ecf60ef012051
Merged-In: I2b41242c9f1e997ceb26d61b893ecf60ef012051

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

diff --git a/src/java/com/android/internal/telephony/RILUtils.java b/src/java/com/android/internal/telephony/RILUtils.java
index 1861cf0..fb11859 100644
--- a/src/java/com/android/internal/telephony/RILUtils.java
+++ b/src/java/com/android/internal/telephony/RILUtils.java
@@ -1099,9 +1099,13 @@
         android.hardware.radio.data.TrafficDescriptor td =
                 new android.hardware.radio.data.TrafficDescriptor();
         td.dnn = trafficDescriptor.getDataNetworkName();
-        android.hardware.radio.data.OsAppId osAppId = new android.hardware.radio.data.OsAppId();
-        osAppId.osAppId = trafficDescriptor.getOsAppId();
-        td.osAppId = osAppId;
+        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;
     }