commit 23226ecae978aabc08eb483f25c5dad0d1b55cba
author Vlad Popa <pvlad@google.com> Wed Aug 28 14:23:29 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 28 14:23:29 2024 +0000
tree f47bb1014ab837a00801f3fde112b88bea91a4c6
parent d45f21d6a48b964051e71a974d40f0c7bae02f2c
parent 6b137d16335663659d9be75db075383fee1ffa06

Merge "Revert^4 "Reapply "AudioFlinger: Control volume using Port ID""" into main

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 5a79ef6..faac4ae 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -5250,7 +5250,7 @@
         }
     }, mediautils::TimeCheck::getDefaultTimeoutDuration(),
     mediautils::TimeCheck::getDefaultSecondChanceDuration(),
-    true /* crashOnTimeout */);
+    !property_get_bool("audio.timecheck.disabled", false) /* crashOnTimeout */);
 
     return delegate();
 }

services/audiopolicy/service/AudioPolicyService.cpp

diff --git a/services/audiopolicy/service/AudioPolicyService.cpp b/services/audiopolicy/service/AudioPolicyService.cpp
index 173f085..2e0aa3c 100644
--- a/services/audiopolicy/service/AudioPolicyService.cpp
+++ b/services/audiopolicy/service/AudioPolicyService.cpp
@@ -1418,7 +1418,7 @@
         }
     }, mediautils::TimeCheck::getDefaultTimeoutDuration(),
     mediautils::TimeCheck::getDefaultSecondChanceDuration(),
-    true /* crashOnTimeout */);
+    !property_get_bool("audio.timecheck.disabled", false) /* crashOnTimeout */);
 
     switch (code) {
         case SHELL_COMMAND_TRANSACTION: {