Merge "[SettingsProvider] enforce permission on openFile" into tm-dev am: 0cb62fa9c7 am: 024b77e641

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17970005

Change-Id: I68ad522192eb9c617c5495c3a2fc5fcc3b00fa13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Songchun Fan
2022-04-28 17:11:16 +00:00
committed by Automerger Merge Worker

View File

@@ -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;