Merge "Audio Policy: Clear calling identity for all paths setting ringer mode." into lmp-mr1-dev

1 files changed, 27 insertions, 32 deletions

diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java
index 1c104228c7f2..f8688da6cced 100644
--- a/media/java/android/media/AudioService.java
+++ b/media/java/android/media/AudioService.java
@@ -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);
-        }
+        setRingerMode(ringerMode, caller, true /*external*/);
     }
 
     public void setRingerModeInternal(int ringerMode, String caller) {
         enforceSelfOrSystemUI("setRingerModeInternal");
-        final long identity = Binder.clearCallingIdentity();
-        try {
-            setRingerMode(ringerMode, caller, false /*external*/);
-        } finally {
-            Binder.restoreCallingIdentity(identity);
-        }
+        setRingerMode(ringerMode, caller, false /*external*/);
     }
 
     private void setRingerMode(int ringerMode, String caller, boolean external) {
@@ -1870,28 +1860,33 @@ public class AudioService extends IAudioService.Stub {
         if ((ringerMode == AudioManager.RINGER_MODE_VIBRATE) && !mHasVibrator) {
             ringerMode = AudioManager.RINGER_MODE_SILENT;
         }
-        synchronized (mSettingsLock) {
-            final int ringerModeInternal = getRingerModeInternal();
-            final int ringerModeExternal = getRingerModeExternal();
-            if (external) {
-                setRingerModeExt(ringerMode);
-                if (mRingerModeDelegate != null) {
-                    ringerMode = mRingerModeDelegate.onSetRingerModeExternal(ringerModeExternal,
-                            ringerMode, caller, ringerModeInternal);
-                }
-                if (ringerMode != ringerModeInternal) {
-                    setRingerModeInt(ringerMode, true /*persist*/);
-                }
-            } else /*internal*/ {
-                if (ringerMode != ringerModeInternal) {
-                    setRingerModeInt(ringerMode, true /*persist*/);
-                }
-                if (mRingerModeDelegate != null) {
-                    ringerMode = mRingerModeDelegate.onSetRingerModeInternal(ringerModeInternal,
-                            ringerMode, caller, ringerModeExternal);
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            synchronized (mSettingsLock) {
+                final int ringerModeInternal = getRingerModeInternal();
+                final int ringerModeExternal = getRingerModeExternal();
+                if (external) {
+                    setRingerModeExt(ringerMode);
+                    if (mRingerModeDelegate != null) {
+                        ringerMode = mRingerModeDelegate.onSetRingerModeExternal(ringerModeExternal,
+                                ringerMode, caller, ringerModeInternal);
+                    }
+                    if (ringerMode != ringerModeInternal) {
+                        setRingerModeInt(ringerMode, true /*persist*/);
+                    }
+                } else /*internal*/ {
+                    if (ringerMode != ringerModeInternal) {
+                        setRingerModeInt(ringerMode, true /*persist*/);
+                    }
+                    if (mRingerModeDelegate != null) {
+                        ringerMode = mRingerModeDelegate.onSetRingerModeInternal(ringerModeInternal,
+                                ringerMode, caller, ringerModeExternal);
+                    }
+                    setRingerModeExt(ringerMode);
                 }
-                setRingerModeExt(ringerMode);
             }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }