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

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

Change-Id: I95ea528c9d2407284f7a9a48f6ca7cfd1e61d074
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Songchun Fan
2022-04-28 16:41:06 +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, getContext().enforceCallingPermission(Manifest.permission.INTERACT_ACROSS_USERS,
"Access files from the settings of another user"); "Access files from the settings of another user");
} }
if (mode.contains("w")) {
enforceWritePermission(Manifest.permission.WRITE_SETTINGS);
}
uri = ContentProvider.getUriWithoutUserId(uri); uri = ContentProvider.getUriWithoutUserId(uri);
final String cacheRingtoneSetting; final String cacheRingtoneSetting;