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

Commit d42fff5d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 1b0fee16 3b7e688d

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

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

        }

        }

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

        uri = ContentProvider.getUriWithoutUserId(uri);





        final String cacheRingtoneSetting;

        final String cacheRingtoneSetting;