diff --git a/media/libaaudio/src/client/AAudioFlowGraph.cpp b/media/libaaudio/src/client/AAudioFlowGraph.cpp
index 5b46ae0..d0c3238 100644
--- a/media/libaaudio/src/client/AAudioFlowGraph.cpp
+++ b/media/libaaudio/src/client/AAudioFlowGraph.cpp
@@ -42,14 +42,15 @@
                           audio_format_t sinkFormat,
                           int32_t sinkChannelCount,
                           bool useMonoBlend,
-                          float audioBalance) {
+                          float audioBalance,
+                          bool isExclusive) {
     FlowGraphPortFloatOutput *lastOutput = nullptr;
 
     // TODO change back to ALOGD
     ALOGI("%s() source format = 0x%08x, channels = %d, sink format = 0x%08x, channels = %d, "
-          "useMonoBlend = %d, audioBalance = %f",
+          "useMonoBlend = %d, audioBalance = %f, isExclusive %d",
           __func__, sourceFormat, sourceChannelCount, sinkFormat, sinkChannelCount,
-          useMonoBlend, audioBalance);
+          useMonoBlend, audioBalance, isExclusive);
 
     switch (sourceFormat) {
         case AUDIO_FORMAT_PCM_FLOAT:
@@ -94,22 +95,25 @@
         return AAUDIO_ERROR_UNIMPLEMENTED;
     }
 
-    // Apply volume ramps to set the left/right audio balance and target volumes.
-    // The signals will be decoupled, volume ramps will be applied, before the signals are
-    // combined again.
-    mMultiToManyConverter = std::make_unique<MultiToManyConverter>(sinkChannelCount);
-    mManyToMultiConverter = std::make_unique<ManyToMultiConverter>(sinkChannelCount);
-    lastOutput->connect(&mMultiToManyConverter->input);
-    for (int i = 0; i < sinkChannelCount; i++) {
-        mVolumeRamps.emplace_back(std::make_unique<RampLinear>(1));
-        mPanningVolumes.emplace_back(1.0f);
-        lastOutput = mMultiToManyConverter->outputs[i].get();
-        lastOutput->connect(&(mVolumeRamps[i].get()->input));
-        lastOutput = &(mVolumeRamps[i].get()->output);
-        lastOutput->connect(mManyToMultiConverter->inputs[i].get());
+    // Apply volume ramps for only exclusive streams.
+    if (isExclusive) {
+        // Apply volume ramps to set the left/right audio balance and target volumes.
+        // The signals will be decoupled, volume ramps will be applied, before the signals are
+        // combined again.
+        mMultiToManyConverter = std::make_unique<MultiToManyConverter>(sinkChannelCount);
+        mManyToMultiConverter = std::make_unique<ManyToMultiConverter>(sinkChannelCount);
+        lastOutput->connect(&mMultiToManyConverter->input);
+        for (int i = 0; i < sinkChannelCount; i++) {
+            mVolumeRamps.emplace_back(std::make_unique<RampLinear>(1));
+            mPanningVolumes.emplace_back(1.0f);
+            lastOutput = mMultiToManyConverter->outputs[i].get();
+            lastOutput->connect(&(mVolumeRamps[i].get()->input));
+            lastOutput = &(mVolumeRamps[i].get()->output);
+            lastOutput->connect(mManyToMultiConverter->inputs[i].get());
+        }
+        lastOutput = &mManyToMultiConverter->output;
+        setAudioBalance(audioBalance);
     }
-    lastOutput = &mManyToMultiConverter->output;
-    setAudioBalance(audioBalance);
 
     switch (sinkFormat) {
         case AUDIO_FORMAT_PCM_FLOAT:
diff --git a/media/libaaudio/src/client/AAudioFlowGraph.h b/media/libaaudio/src/client/AAudioFlowGraph.h
index 2056b70..00b6575 100644
--- a/media/libaaudio/src/client/AAudioFlowGraph.h
+++ b/media/libaaudio/src/client/AAudioFlowGraph.h
@@ -43,6 +43,7 @@
      * @param useMonoBlend
      * @param audioBalance
      * @param channelMask
+     * @param isExclusive
      * @return
      */
     aaudio_result_t configure(audio_format_t sourceFormat,
@@ -50,7 +51,8 @@
                               audio_format_t sinkFormat,
                               int32_t sinkChannelCount,
                               bool useMonoBlend,
-                              float audioBalance);
+                              float audioBalance,
+                              bool isExclusive);
 
     void process(const void *source, void *destination, int32_t numFrames);
 
diff --git a/media/libaaudio/src/client/AudioStreamInternalPlay.cpp b/media/libaaudio/src/client/AudioStreamInternalPlay.cpp
index 8292573..450d390 100644
--- a/media/libaaudio/src/client/AudioStreamInternalPlay.cpp
+++ b/media/libaaudio/src/client/AudioStreamInternalPlay.cpp
@@ -54,7 +54,8 @@
                              getDeviceFormat(),
                              getDeviceChannelCount(),
                              getRequireMonoBlend(),
-                             getAudioBalance());
+                             getAudioBalance(),
+                             (getSharingMode() == AAUDIO_SHARING_MODE_EXCLUSIVE));
 
         if (result != AAUDIO_OK) {
             safeReleaseClose();
