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

Commit a2110e58 authored by Victor Chang's avatar Victor Chang Committed by Automerger Merge Worker
Browse files

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

Merge "Revert "[SettingsProvider] enforce permission on openFile"" into tm-dev am: ca88bd08 am: 840b7333 am: 0151bfe9 am: a99b8e1c

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



Change-Id: I8fb10d6dbefeea2cf78ff83369de296cdf4e27e0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents beb0d6d0 a99b8e1c

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

+0 −3
Original line number Diff line number Diff line
@@ -818,9 +818,6 @@ 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;