Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd03eb9d authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Enforce MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE permission" into... 

Merge "Enforce MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE permission" into rvc-dev am: d0effa24 am: 2268e822

Change-Id: I52b73b7c85c6a1031d296b3d505d8a39631871f6
parents d45d4f91 2268e822

core/java/android/provider/Settings.java

+2 −1
Original line number Diff line number Diff line
@@ -98,7 +98,8 @@ import java.util.Set; 
 * The Settings provider contains global system-level device preferences.

 */

public final class Settings {

    private static final boolean DEFAULT_OVERRIDEABLE_BY_RESTORE = false;

    /** @hide */

    public static final boolean DEFAULT_OVERRIDEABLE_BY_RESTORE = false;















    // Intent actions for Settings















































packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java



+5
−0




























Original line number
Diff line number
Diff line








@@ -2778,6 +2778,11 @@ public class SettingsProvider extends ContentProvider {













        public boolean insertSettingLocked(int type, int userId, String name, String value,















                String tag, boolean makeDefault, boolean forceNonSystemPackage, String packageName,















                boolean forceNotify, Set<String> criticalSettings, boolean overrideableByRestore) {













            if (overrideableByRestore != Settings.DEFAULT_OVERRIDEABLE_BY_RESTORE) {













                getContext().enforceCallingOrSelfPermission(













                        Manifest.permission.MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE,













                        "Caller is not allowed to modify settings overrideable by restore");













            }















            final int key = makeKey(type, userId);































            boolean success = false;