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

Commit 33dc4be5 authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

Merge "AudioService: refactor audio mode stack" into sc-dev am: f872f163 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13417627

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iadac8bc5d3af0335781a2edcd4f095b70b34cd2b
parents 1abe8afc f872f163

media/java/android/media/AudioManager.java

+0 −1
Original line number Diff line number Diff line 
/*

/*

 * Copyright (C) 2007 The Android Open Source Project

 *

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

+0 −4
Original line number Diff line number Diff line
@@ -765,10 +765,6 @@ import java.util.concurrent.atomic.AtomicBoolean; 
        return mAudioService.getVssVolumeForDevice(streamType, device);

    }



    /*package*/ int getModeOwnerPid() {

        return mModeOwnerPid;

    }



    /*package*/ int getDeviceForStream(int streamType) {

        return mAudioService.getDeviceForStream(streamType);

    }

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

+402 −224

File changed.

Preview size limit exceeded, changes collapsed.