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

Commit e7ad8ffb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert "[SettingsProvider] enforce permission on openFile"""... 

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

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



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

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

+7 −0
Original line number Diff line number Diff line
@@ -818,6 +818,13 @@ public class SettingsProvider extends ContentProvider { 
            getContext().enforceCallingPermission(Manifest.permission.INTERACT_ACROSS_USERS,

                    "Access files from the settings of another user");

        }

        final String callingPackage = getCallingPackage();

        if (mode.contains("w") && !Settings.checkAndNoteWriteSettingsOperation(getContext(),

                Binder.getCallingUid(), callingPackage, getCallingAttributionTag(),

                true /* throwException */)) {

            Slog.e(LOG_TAG, "Package: " + callingPackage + " is not allowed to modify "

                    + "system settings files.");

        }

        uri = ContentProvider.getUriWithoutUserId(uri);



        final String cacheRingtoneSetting;