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

Commit 607282ad authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "AudioService: check permission on forceVolumeControlStream"

parents c296e7f8 60eddfde

media/java/android/media/AudioManager.java

+1 −0
Original line number Diff line number Diff line
@@ -1227,6 +1227,7 @@ public class AudioManager { 
     *

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)

    public void forceVolumeControlStream(int streamType) {

        final IAudioService service = getService();

        try {

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

+4 −0
Original line number Diff line number Diff line
@@ -1951,6 +1951,10 @@ public class AudioService extends IAudioService.Stub 


    /** @see AudioManager#forceVolumeControlStream(int) */

    public void forceVolumeControlStream(int streamType, IBinder cb) {

        if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.MODIFY_PHONE_STATE)

                != PackageManager.PERMISSION_GRANTED) {

            return;

        }

        if (DEBUG_VOL) { Log.d(TAG, String.format("forceVolumeControlStream(%d)", streamType)); }

        synchronized(mForceControlStreamLock) {

            if (mVolumeControlStream != -1 && streamType != -1) {