commit 77842fdfbcdeb5502a69236d8206378e56cd7296
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Oct 30 02:59:39 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 30 02:59:39 2024 +0000
tree c427d8bb2920c75c3a6e94098dd59dbee9c6d8e0
parent 5e84fc13a9674112be26dc2687a8b13ce0a80eba
parent 4c4778a675b4027f5aa53227199e52beaee4f237

Merge "audio: Fix incorrect userId for setMicMute" into main

media/java/android/media/AudioManager.java

diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java
index 4627be3..8250a53 100644
--- a/media/java/android/media/AudioManager.java
+++ b/media/java/android/media/AudioManager.java
@@ -1161,7 +1161,7 @@
         final IAudioService service = getService();
         try {
             service.setMasterMute(mute, flags, getContext().getOpPackageName(),
-                    UserHandle.getCallingUserId(), getContext().getAttributionTag());
+                    getContext().getUserId(), getContext().getAttributionTag());
         } catch (RemoteException e) {
             throw e.rethrowFromSystemServer();
         }
@@ -3278,7 +3278,7 @@
         final IAudioService service = getService();
         try {
             service.setMicrophoneMute(on, getContext().getOpPackageName(),
-                    UserHandle.getCallingUserId(), getContext().getAttributionTag());
+                    getContext().getUserId(), getContext().getAttributionTag());
         } catch (RemoteException e) {
             throw e.rethrowFromSystemServer();
         }