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

Commit 8c85c68c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[SettingsProvider] verify ringtone URI before setting" into rvc-dev am:... 

Merge "[SettingsProvider] verify ringtone URI before setting" into rvc-dev am: 94189125 am: 037f529f am: 456da723 am: ff4b0629 am: 9fd44ec1

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



Change-Id: Iae3622268cc989ce61f07bd8f23db8af2577b706
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3402768c 9fd44ec1

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

+31 −0
Original line number Diff line number Diff line
@@ -1928,6 +1928,9 @@ public class SettingsProvider extends ContentProvider { 
            cacheName = Settings.System.ALARM_ALERT_CACHE;

        }

        if (cacheName != null) {

            if (!isValidAudioUri(name, value)) {

                return false;

            }

            final File cacheFile = new File(

                    getRingtoneCacheDir(owningUserId), cacheName);

            cacheFile.delete();
@@ -1960,6 +1963,34 @@ public class SettingsProvider extends ContentProvider { 
        }

    }



    private boolean isValidAudioUri(String name, String uri) {

        if (uri != null) {

            Uri audioUri = Uri.parse(uri);

            if (Settings.AUTHORITY.equals(

                    ContentProvider.getAuthorityWithoutUserId(audioUri.getAuthority()))) {

                // Don't accept setting the default uri to self-referential URIs like

                // Settings.System.DEFAULT_RINGTONE_URI, which is an alias to the value of this

                // setting.

                return false;

            }

            final String mimeType = getContext().getContentResolver().getType(audioUri);

            if (mimeType == null) {

                Slog.e(LOG_TAG,

                        "mutateSystemSetting for setting: " + name + " URI: " + audioUri

                        + " ignored: failure to find mimeType (no access from this context?)");

                return false;

            }

            if (!(mimeType.startsWith("audio/") || mimeType.equals("application/ogg")

                    || mimeType.equals("application/x-flac"))) {

                Slog.e(LOG_TAG,

                        "mutateSystemSetting for setting: " + name + " URI: " + audioUri

                        + " ignored: associated mimeType: " + mimeType + " is not an audio type");

                return false;

            }

        }

        return true;

    }



    private boolean hasWriteSecureSettingsPermission() {

        // Write secure settings is a more protected permission. If caller has it we are good.

        return getContext().checkCallingOrSelfPermission(Manifest.permission.WRITE_SECURE_SETTINGS)