commit 3a2a9551fe198ee34f4eb6eb243588c9e8eb15ce
author Nagendra Prasad Nagarle Basavaraju <nagendranb@google.com> Tue Jan 24 11:10:45 2023 +0000
committer Nagendra Prasad Nagarle Basavaraju <nagendranb@google.com> Wed Jan 25 03:58:27 2023 +0000
tree 8e4640c4a556e54a116d25715e5f227252fceec1
parent 249548697d7110c4c3b5b41d8cbef4375757cfa9

[Fix]Media CB Regression

- NPE @ ActiveCallTracker::TransportQuality.mCallQualityBlockList

Bug: 266532504
Test: device
Change-Id: Ib9ffc6a5945dfb72a2b977f3c0a5a56660365fe4

services/QualifiedNetworksService/src/com/android/telephony/qns/QnsCallStatusTracker.java

diff --git a/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsCallStatusTracker.java b/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsCallStatusTracker.java
index 3b67241..7ae7e26 100644
--- a/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsCallStatusTracker.java
+++ b/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsCallStatusTracker.java
@@ -652,18 +652,18 @@
         }
 
         private void onUpdateCallQuality(CallQuality cq) {
-            long now = QnsUtils.getSystemElapsedRealTime();
-            CallQualityBlock prev = null;
             TransportQuality transportQuality = getLastTransportQuality(mTransportType);
             if (transportQuality != null) {
-                prev = transportQuality.getLastCallQualityBlock();
+                long now = QnsUtils.getSystemElapsedRealTime();
+                CallQualityBlock prev = transportQuality.getLastCallQualityBlock();
+                if (prev != null) {
+                    prev.mDurationMillis = now - prev.mCreatedElapsedTime;
+                }
+                transportQuality.mCallQualityBlockList.add(
+                        new CallQualityBlock(
+                                cq.getUplinkCallQualityLevel(), cq.getDownlinkCallQualityLevel(),
+                                now));
             }
-            if (prev != null) {
-                prev.mDurationMillis = now - prev.mCreatedElapsedTime;
-            }
-            transportQuality.mCallQualityBlockList.add(
-                    new CallQualityBlock(
-                            cq.getUplinkCallQualityLevel(), cq.getDownlinkCallQualityLevel(), now));
         }
 
         private boolean isDummyCallQuality(CallQuality cq) {