commit 2d6224dda4c2fd886e4379d2974d2ed9da195a92
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Sep 07 00:03:55 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Sep 07 00:03:55 2024 +0000
tree a932a4de38d96d1b2a763faf3509e7638ae59ec5
parent 4faf9da2748f4f1629c4d317d3ffa5f5048b5d56
parent 9aa1998de7fea0297a976a68cfc1f69ec905a036

Merge "audio: Fix permission barrier regression on next" into main

services/core/java/com/android/server/audio/AudioService.java

diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index 780eda6..bd00241 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -14727,6 +14727,7 @@
     @Override
     /** @see AudioManager#permissionUpdateBarrier() */
     public void permissionUpdateBarrier() {
+        if (!audioserverPermissions()) return;
         mAudioSystem.triggerSystemPropertyUpdate(mSysPropListenerNativeHandle);
         List<Future> snapshot;
         synchronized (mScheduledPermissionTasks) {