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

Commit f872f163 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

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

parents ead7d81e ae3df8e8

media/java/android/media/AudioManager.java

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

/*

/*

 * Copyright (C) 2007 The Android Open Source Project

 * Copyright (C) 2007 The Android Open Source Project

 *

 *

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

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

        return mAudioService.getVssVolumeForDevice(streamType, device);

    }

    }





    /*package*/ int getModeOwnerPid() {

        return mModeOwnerPid;

    }



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

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

        return mAudioService.getDeviceForStream(streamType);

        return mAudioService.getDeviceForStream(streamType);

    }

    }

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

+402 −224

File changed.

Preview size limit exceeded, changes collapsed.