Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af89aaa6 authored by Dmitry Shmidt's avatar Dmitry Shmidt Committed by android-build-merger
Browse files

Merge "AudioService: Fix Mic Mute restriction processing"

am: 94ec4598

Change-Id: I0fc4a58eb69957f5dae7235edbbd9e6750f27ded
parents c2f5e335 94ec4598
Loading
Loading
Loading
Loading
+5 −4
Original line number Diff line number Diff line
@@ -1566,12 +1566,13 @@ public class AudioService extends IAudioService.Stub
        AudioSystem.setMasterMute(masterMute);
        broadcastMasterMuteStatus(masterMute);

        boolean microphoneMute = mUserManagerInternal.getUserRestriction(
        mMicMuteFromRestrictions = mUserManagerInternal.getUserRestriction(
                currentUser, UserManager.DISALLOW_UNMUTE_MICROPHONE);
        if (DEBUG_VOL) {
            Log.d(TAG, String.format("Mic mute %s, user=%d", microphoneMute, currentUser));
            Log.d(TAG, String.format("Mic mute %b, user=%d", mMicMuteFromRestrictions,
                    currentUser));
        }
        AudioSystem.muteMicrophone(microphoneMute);
        setMicrophoneMuteNoCallerCheck(currentUser);
    }

    private int rescaleIndex(int index, int srcStream, int dstStream) {
@@ -2876,7 +2877,7 @@ public class AudioService extends IAudioService.Stub
    private void setMicrophoneMuteNoCallerCheck(int userId) {
        final boolean muted = isMicrophoneMuted();
        if (DEBUG_VOL) {
            Log.d(TAG, String.format("Mic mute %d, user=%d", muted, userId));
            Log.d(TAG, String.format("Mic mute %b, user=%d", muted, userId));
        }
        // only mute for the current user
        if (getCurrentUserId() == userId || userId == android.os.Process.SYSTEM_UID) {