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

Commit c6d6cd23 authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "Remove unneccessary a2dpDeviceChanged variable" am: 98919aff am: 6fda0e36 

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

Change-Id: I7bb200d8ea1be541aad0162f3b3df22367ab3330
parents b4f0b7c9 6fda0e36

services/audioflinger/Threads.cpp

+2 −6
Original line number Diff line number Diff line
@@ -5552,8 +5552,6 @@ bool AudioFlinger::MixerThread::checkForNewParameter_l(const String8& keyValuePa 
                                                       status_t& status)

{

    bool reconfig = false;

    bool a2dpDeviceChanged = false;



    status = NO_ERROR;



    AutoPark<FastMixer> park(mFastMixer);
@@ -5625,7 +5623,7 @@ bool AudioFlinger::MixerThread::checkForNewParameter_l(const String8& keyValuePa 
        }

    }



    return reconfig || a2dpDeviceChanged;

    return reconfig;

}
@@ -6086,8 +6084,6 @@ bool AudioFlinger::DirectOutputThread::checkForNewParameter_l(const String8& key 
                                                              status_t& status)

{

    bool reconfig = false;

    bool a2dpDeviceChanged = false;



    status = NO_ERROR;



    AudioParameter param = AudioParameter(keyValuePair);
@@ -6122,7 +6118,7 @@ bool AudioFlinger::DirectOutputThread::checkForNewParameter_l(const String8& key 
        }

    }



    return reconfig || a2dpDeviceChanged;

    return reconfig;

}



uint32_t AudioFlinger::DirectOutputThread::activeSleepTimeUs() const