commit c6d6cd23bd860de366416b5a4615c2640cacdf51
author Andy Hung <hunga@google.com> Tue Mar 23 23:34:27 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 23 23:34:27 2021 +0000
tree c12ab8bd1f45afcda61eed04840e490bd124fce9
parent b4f0b7c9007da5dca82b2a7faf07e4e85b4b5892
parent 6fda0e3638dbc1810763367f5d9babefa93024b5

Merge "Remove unneccessary a2dpDeviceChanged variable" am: 98919aff22 am: 6fda0e3638

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1646948

Change-Id: I7bb200d8ea1be541aad0162f3b3df22367ab3330

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index fa16298..64e935d 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -5552,8 +5552,6 @@
                                                        status_t& status)
 {
     bool reconfig = false;
-    bool a2dpDeviceChanged = false;
-
     status = NO_ERROR;
 
     AutoPark<FastMixer> park(mFastMixer);
@@ -5625,7 +5623,7 @@
         }
     }
 
-    return reconfig || a2dpDeviceChanged;
+    return reconfig;
 }
 
 
@@ -6086,8 +6084,6 @@
                                                               status_t& status)
 {
     bool reconfig = false;
-    bool a2dpDeviceChanged = false;
-
     status = NO_ERROR;
 
     AudioParameter param = AudioParameter(keyValuePair);
@@ -6122,7 +6118,7 @@
         }
     }
 
-    return reconfig || a2dpDeviceChanged;
+    return reconfig;
 }
 
 uint32_t AudioFlinger::DirectOutputThread::activeSleepTimeUs() const