diff options
| author | Svetoslav <svetoslavganov@google.com> | 2015-06-25 18:53:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-25 18:53:59 +0000 |
| commit | f9c6dbb6d1c2001c0ccd7479668eb59b1d4b7c5c (patch) | |
| tree | 2009a38cf4f8421a24620b69bf5787e9706062d2 /packages | |
| parent | 0ebd001f3068116b93e8a447f35f01a5b96ec161 (diff) | |
| parent | 45146493c6cbb3f39d92b41e5bc8742fb1e04ff6 (diff) | |
| download | frameworks_base-f9c6dbb6d1c2001c0ccd7479668eb59b1d4b7c5c.zip frameworks_base-f9c6dbb6d1c2001c0ccd7479668eb59b1d4b7c5c.tar.gz frameworks_base-f9c6dbb6d1c2001c0ccd7479668eb59b1d4b7c5c.tar.bz2 | |
Merge "Add missing conditional in settings provider" into mnc-dev
Diffstat (limited to 'packages')
| -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()) { |