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

Commit af88a191 authored by John Spurlock's avatar John Spurlock
Browse files

Audio Policy: Clear calling identity for all paths setting ringer mode. 

For proper appops bookkeeping and zen setting changes.

Bug: 18832923
Change-Id: Ic029d3226458ca1a9229a0bc5726bedd5e117ad7
parent 2c8c47da

media/java/android/media/AudioService.java

+27 −32
Original line number Diff line number Diff line
@@ -1841,22 +1841,12 @@ public class AudioService extends IAudioService.Stub { 
    }



    public void setRingerModeExternal(int ringerMode, String caller) {

        final long identity = Binder.clearCallingIdentity();

        try {

        setRingerMode(ringerMode, caller, true /*external*/);

        } finally {

            Binder.restoreCallingIdentity(identity);

        }

    }



    public void setRingerModeInternal(int ringerMode, String caller) {

        enforceSelfOrSystemUI("setRingerModeInternal");

        final long identity = Binder.clearCallingIdentity();

        try {

        setRingerMode(ringerMode, caller, false /*external*/);

        } finally {

            Binder.restoreCallingIdentity(identity);

        }

    }



    private void setRingerMode(int ringerMode, String caller, boolean external) {
@@ -1870,6 +1860,8 @@ public class AudioService extends IAudioService.Stub { 
        if ((ringerMode == AudioManager.RINGER_MODE_VIBRATE) && !mHasVibrator) {

            ringerMode = AudioManager.RINGER_MODE_SILENT;

        }

        final long identity = Binder.clearCallingIdentity();

        try {

            synchronized (mSettingsLock) {

                final int ringerModeInternal = getRingerModeInternal();

                final int ringerModeExternal = getRingerModeExternal();
@@ -1893,6 +1885,9 @@ public class AudioService extends IAudioService.Stub { 
                    setRingerModeExt(ringerMode);

                }

            }

        } finally {

            Binder.restoreCallingIdentity(identity);

        }

    }



    private void setRingerModeExt(int ringerMode) {