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

Commit 7a5e865a authored by Ivan Chiang's avatar Ivan Chiang Committed by Automerger Merge Worker
Browse files

Merge "Revert "Ringtone uri should add type query"" am: 56da2781 

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

Change-Id: Ia0de693ab6e40de6591ebf223ca9da177ae9735e
parents 8e139a82 56da2781

media/java/android/media/RingtoneManager.java

+2 −13
Original line number Original line Diff line number Diff line
@@ -1129,14 +1129,12 @@ public class RingtoneManager { 
            }

            }





            // Try finding the scanned ringtone

            // Try finding the scanned ringtone

            final String whichAudio = getQueryStringForType(type);

            final String filename = getDefaultRingtoneFilename(type);

            final String filename = getDefaultRingtoneFilename(type);

            final String where = MediaColumns.DISPLAY_NAME + "=?," + whichAudio + "=?";

            final Uri baseUri = MediaStore.Audio.Media.INTERNAL_CONTENT_URI;

            final Uri baseUri = MediaStore.Audio.Media.INTERNAL_CONTENT_URI;

            try (Cursor cursor = context.getContentResolver().query(baseUri,

            try (Cursor cursor = context.getContentResolver().query(baseUri,

                    new String[] { MediaColumns._ID },

                    new String[] { MediaColumns._ID },

                    where,

                    MediaColumns.DISPLAY_NAME + "=?",

                    new String[] { filename , "1"}, null)) {

                    new String[] { filename }, null)) {

                if (cursor.moveToFirst()) {

                if (cursor.moveToFirst()) {

                    final Uri ringtoneUri = context.getContentResolver().canonicalizeOrElse(

                    final Uri ringtoneUri = context.getContentResolver().canonicalizeOrElse(

                            ContentUris.withAppendedId(baseUri, cursor.getLong(0)));

                            ContentUris.withAppendedId(baseUri, cursor.getLong(0)));
@@ -1164,13 +1162,4 @@ public class RingtoneManager { 
            default: throw new IllegalArgumentException();

            default: throw new IllegalArgumentException();

        }

        }

    }

    }



    private static String getQueryStringForType(int type) {

        switch (type) {

            case TYPE_RINGTONE: return MediaStore.Audio.AudioColumns.IS_RINGTONE;

            case TYPE_NOTIFICATION: return MediaStore.Audio.AudioColumns.IS_NOTIFICATION;

            case TYPE_ALARM: return MediaStore.Audio.AudioColumns.IS_ALARM;

            default: throw new IllegalArgumentException();

        }

    }

}
 
}