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

Commit 5dacfc4d authored by Songchun Fan's avatar Songchun Fan Committed by Automerger Merge Worker
Browse files

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

Merge "[SettingsProvider] enforce permission on openFile" into tm-dev am: 0cb62fa9 am: 024b77e6 am: 4722432a

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



Change-Id: I2d7f7ec2d47cfb9b6c328cd0da47f3cd386ec104
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 57297674 4722432a

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

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