diff options
| author | Svetoslav <svetoslavganov@google.com> | 2015-06-25 19:03:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-25 19:03:42 +0000 |
| commit | cf831c878600ec4c386fd4f356756f27fec9718f (patch) | |
| tree | 462c1eb185a0cebc3f29886467c63e22fab90d3e /packages/SettingsProvider | |
| parent | 6a75422b6224a51bb7ed8cb72bbee98cd4ca43e7 (diff) | |
| parent | f9c6dbb6d1c2001c0ccd7479668eb59b1d4b7c5c (diff) | |
| download | frameworks_base-cf831c878600ec4c386fd4f356756f27fec9718f.zip frameworks_base-cf831c878600ec4c386fd4f356756f27fec9718f.tar.gz frameworks_base-cf831c878600ec4c386fd4f356756f27fec9718f.tar.bz2 | |
am f9c6dbb6: Merge "Add missing conditional in settings provider" into mnc-dev
* commit 'f9c6dbb6d1c2001c0ccd7479668eb59b1d4b7c5c':
Add missing conditional in settings provider
Diffstat (limited to 'packages/SettingsProvider')
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 44b9d8b..41043eb 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -905,7 +905,9 @@ public class SettingsProvider extends ContentProvider { private boolean mutateSystemSetting(String name, String value, int runAsUserId, int operation) { // Check for permissions first. - hasPermissionsToMutateSystemSettings(); + if (!hasPermissionsToMutateSystemSettings()) { + return false; + } // Verify whether this operation is allowed for the calling package. if (!isAppOpWriteSettingsAllowedForCallingPackage()) { |