commit daaee5884ff59918687a8ec6b66c71139f3ffef0
author android-build-team Robot <android-build-team-robot@google.com> Thu Jun 18 07:14:21 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Jun 18 07:16:49 2020 +0000
tree 737dc3d3ae862357d8dc38c0ec6017188c4a635f
parent 18e128e9e2485440bf28bfaace71561513dbc297
parent fc16421a67d1979ff91b6df67dba38d4a15fa582

Make change and version bump to r_aml_300802000 for mainline module file: apex/manifest_codec.json

Change-Id: If2a219d489171c1fb6119003f8ea458068ebda53

apex/manifest.json

diff --git a/apex/manifest.json b/apex/manifest.json
index 0e49136..f8d3c79 100644
--- a/apex/manifest.json
+++ b/apex/manifest.json
@@ -1,4 +1,4 @@
 {
   "name": "com.android.media",
-  "version": 300801900
+  "version": 300802000
 }

apex/manifest_codec.json

diff --git a/apex/manifest_codec.json b/apex/manifest_codec.json
index b38aa12..1b97232 100644
--- a/apex/manifest_codec.json
+++ b/apex/manifest_codec.json
@@ -1,4 +1,4 @@
 {
   "name": "com.android.media.swcodec",
-  "version": 300801900
+  "version": 300802000
 }

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 89d0a85..5930117 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -6062,10 +6062,6 @@
     bool trackPaused = false;
     bool trackStopped = false;
 
-    if ((mType == DIRECT) && audio_is_linear_pcm(mFormat) && !usesHwAvSync()) {
-        return !mStandby;
-    }
-
     // do not put the HAL in standby when paused. AwesomePlayer clear the offloaded AudioTrack
     // after a timeout and we will enter standby then.
     if (mTracks.size() > 0) {