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

Commit 09c1453b authored by Eric Laurent's avatar Eric Laurent Committed by android-build-merger
Browse files

Merge "Prevent 3rd party app from turning on speaker during the system call... 

Merge "Prevent 3rd party app from turning on speaker during the system call Test: manual" am: cec74047
am: e6fc1209

Change-Id: I795538f4f0d222d5521d798349474f94b108fafa
parents 44f24957 e6fc1209

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

+15 −0
Original line number Diff line number Diff line
@@ -3260,6 +3260,21 @@ public class AudioService extends IAudioService.Stub 
        if (!checkAudioSettingsPermission("setSpeakerphoneOn()")) {

            return;

        }



        if (mContext.checkCallingOrSelfPermission(

                android.Manifest.permission.MODIFY_PHONE_STATE)

                != PackageManager.PERMISSION_GRANTED) {

            synchronized (mSetModeDeathHandlers) {

                for (SetModeDeathHandler h : mSetModeDeathHandlers) {

                    if (h.getMode() == AudioSystem.MODE_IN_CALL) {

                        Log.w(TAG, "getMode is call, Permission Denial: setSpeakerphoneOn from pid="

                                + Binder.getCallingPid() + ", uid=" + Binder.getCallingUid());

                        return;

                    }

                }

            }

        }



        // for logging only

        final String eventSource = new StringBuilder("setSpeakerphoneOn(").append(on)

                .append(") from u/pid:").append(Binder.getCallingUid()).append("/")