diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2015-05-27 11:25:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-27 11:25:33 +0000 |
| commit | 81c73e121ef2ff44a3916628d9ff11385db85bd6 (patch) | |
| tree | 20bc9635eae31c2ab3c4e328990ada8163c812af /services/devicepolicy/java/com | |
| parent | 0f22ec9777d94c39364d340b454e99c44cac7d9a (diff) | |
| parent | 21d9ef6dc71886209965f70728b563fd7d78d6c8 (diff) | |
| download | frameworks_base-81c73e121ef2ff44a3916628d9ff11385db85bd6.zip frameworks_base-81c73e121ef2ff44a3916628d9ff11385db85bd6.tar.gz frameworks_base-81c73e121ef2ff44a3916628d9ff11385db85bd6.tar.bz2 | |
Merge "Clear caller identity before setting all the user restrictions." into mnc-dev
Diffstat (limited to 'services/devicepolicy/java/com')
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index fc09db3..d807b0b 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -5381,20 +5381,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { ServiceManager.getService(Context.AUDIO_SERVICE)); } - if (enabled && !alreadyRestricted) { - try { - if (UserManager.DISALLOW_UNMUTE_MICROPHONE.equals(key)) { - iAudioService.setMicrophoneMute(true, who.getPackageName()); - } else if (UserManager.DISALLOW_ADJUST_VOLUME.equals(key)) { - iAudioService.setMasterMute(true, 0, who.getPackageName()); - } - } catch (RemoteException re) { - Slog.e(LOG_TAG, "Failed to talk to AudioService.", re); - } - } long id = Binder.clearCallingIdentity(); try { if (enabled && !alreadyRestricted) { + if (UserManager.DISALLOW_UNMUTE_MICROPHONE.equals(key)) { + iAudioService.setMicrophoneMute(true, mContext.getPackageName()); + } else if (UserManager.DISALLOW_ADJUST_VOLUME.equals(key)) { + iAudioService.setMasterMute(true, 0, mContext.getPackageName()); + } if (UserManager.DISALLOW_CONFIG_WIFI.equals(key)) { Settings.Secure.putIntForUser(mContext.getContentResolver(), Settings.Secure.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0, @@ -5443,19 +5437,17 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { mContext.getContentResolver().notifyChange(url, null, true, userHandle); } } - } finally { - restoreCallingIdentity(id); - } - if (!enabled && alreadyRestricted) { - try { + if (!enabled && alreadyRestricted) { if (UserManager.DISALLOW_UNMUTE_MICROPHONE.equals(key)) { - iAudioService.setMicrophoneMute(false, who.getPackageName()); + iAudioService.setMicrophoneMute(false, mContext.getPackageName()); } else if (UserManager.DISALLOW_ADJUST_VOLUME.equals(key)) { - iAudioService.setMasterMute(false, 0, who.getPackageName()); + iAudioService.setMasterMute(false, 0, mContext.getPackageName()); } - } catch (RemoteException re) { - Slog.e(LOG_TAG, "Failed to talk to AudioService.", re); } + } catch (RemoteException re) { + Slog.e(LOG_TAG, "Failed to talk to AudioService.", re); + } finally { + restoreCallingIdentity(id); } sendChangedNotification(userHandle); } |