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

Commit 682944b4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "RingtoneManager: allow video ringtone URI" into sc-dev am: 5153b26b... 

Merge "RingtoneManager: allow video ringtone URI" into sc-dev am: 5153b26b am: 2ea55003 am: 07a72155

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



Change-Id: Ief9afa752fd1b17420885aa0549717a0ca15e914
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 74b1670d 07a72155

media/java/android/media/RingtoneManager.java

+6 −2
Original line number Diff line number Diff line
@@ -803,9 +803,13 @@ public class RingtoneManager { 
                        + " ignored: failure to find mimeType (no access from this context?)");

                return;

            }

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

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

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

                    // also check for video ringtones

                    || mimeType.startsWith("video/") || mimeType.equals("application/mp4"))) {

                Log.e(TAG, "setActualDefaultRingtoneUri for URI:" + ringtoneUri

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

                        + " ignored: associated MIME type:" + mimeType

                        + " is not a recognized audio or video type");

                return;

            }

        }

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

+7 −4
Original line number Diff line number Diff line
@@ -1928,7 +1928,7 @@ public class SettingsProvider extends ContentProvider { 
            cacheName = Settings.System.ALARM_ALERT_CACHE;

        }

        if (cacheName != null) {

            if (!isValidAudioUri(name, value)) {

            if (!isValidMediaUri(name, value)) {

                return false;

            }

            final File cacheFile = new File(
@@ -1963,7 +1963,7 @@ public class SettingsProvider extends ContentProvider { 
        }

    }



    private boolean isValidAudioUri(String name, String uri) {

    private boolean isValidMediaUri(String name, String uri) {

        if (uri != null) {

            Uri audioUri = Uri.parse(uri);

            if (Settings.AUTHORITY.equals(
@@ -1981,10 +1981,13 @@ public class SettingsProvider extends ContentProvider { 
                return false;

            }

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

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

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

                    // also check for video ringtones

                    || mimeType.startsWith("video/") || mimeType.equals("application/mp4"))) {

                Slog.e(LOG_TAG,

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

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

                        + " ignored: associated MIME type: " + mimeType

                        + " is not a recognized audio or video type");

                return false;

            }

        }