commit 3fd3d310197cb1a08c04e16280b31f58367e94a3
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Sep 09 17:16:09 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 09 17:16:09 2024 +0000
tree b87a810e05e2d939eaaebbfb8f01002e46ea8d56
parent de9ef3fd0c1b7435653a5e2885c7ff603c316462
parent 64f9979273f55e8f455b631d96a80a3b533d26a6

Merge "Prevent NPE due to race condition in CallAudioRouteStateMachine." into main

src/com/android/server/telecom/CallAudioRouteStateMachine.java

diff --git a/src/com/android/server/telecom/CallAudioRouteStateMachine.java b/src/com/android/server/telecom/CallAudioRouteStateMachine.java
index 0a99903..4283b7b 100644
--- a/src/com/android/server/telecom/CallAudioRouteStateMachine.java
+++ b/src/com/android/server/telecom/CallAudioRouteStateMachine.java
@@ -2110,8 +2110,9 @@
     private int getCurrentCallSupportedRoutes() {
         int supportedRoutes = CallAudioState.ROUTE_ALL;
 
-        if (mCallsManager.getForegroundCall() != null) {
-            supportedRoutes &= mCallsManager.getForegroundCall().getSupportedAudioRoutes();
+        Call foregroundCall = mCallsManager.getForegroundCall();
+        if (foregroundCall != null) {
+            supportedRoutes &= foregroundCall.getSupportedAudioRoutes();
         }
 
         return supportedRoutes;