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

Commit a559881d authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "[SettingsProvider] enforce permission on openFile" into tm-dev...

Merge "Merge "[SettingsProvider] enforce permission on openFile" into tm-dev am: 0cb62fa9 am: 1637f88a"
parents a5818269 86b8f15d
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -818,6 +818,9 @@ public class SettingsProvider extends ContentProvider {
            getContext().enforceCallingPermission(Manifest.permission.INTERACT_ACROSS_USERS,
                    "Access files from the settings of another user");
        }
        if (mode.contains("w")) {
            enforceWritePermission(Manifest.permission.WRITE_SETTINGS);
        }
        uri = ContentProvider.getUriWithoutUserId(uri);

        final String cacheRingtoneSetting;