Merge "Add missing conditional in settings provider" into mnc-dev

2015-06-25 18:53:57 +00:00
parent 0ebd001f30 45146493c6
commit f9c6dbb6d1
1 changed files with 3 additions and 1 deletions
--- 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()) {