commit f755ff893da7a73f4c44294102af9e7645532021
author Linux Build Service Account <lnxbuild@localhost> Fri Apr 26 10:23:13 2019 -0700
committer Linux Build Service Account <lnxbuild@localhost> Fri Apr 26 10:23:13 2019 -0700
tree aded5560fa258fddf90a1098c650a081d934ba91
parent 4f4fb9632b71c055501f5cc214f486563209e656
parent cbc2e45613f0de25a695b0119947b3968083ef3b

Merge cbc2e45613f0de25a695b0119947b3968083ef3b on remote branch

Change-Id: I1c401de98069dd6ae140689ce0d3bad44a3ad430

fmapp2/src/com/caf/fmradio/FMRadioService.java

diff --git a/fmapp2/src/com/caf/fmradio/FMRadioService.java b/fmapp2/src/com/caf/fmradio/FMRadioService.java
index 5a08422..884f255 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadioService.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java
@@ -1357,7 +1357,7 @@
        cv.put(MediaStore.Audio.Media.DATA, file.getAbsolutePath());
        cv.put(MediaStore.Audio.Media.DATE_ADDED, (int) (current / 1000));
        cv.put(MediaStore.Audio.Media.DATE_MODIFIED, (int) (modDate / 1000));
-       cv.put(MediaStore.Audio.Media.MIME_TYPE, "AUDIO_AAC_MP4");
+       cv.put(MediaStore.Audio.Media.MIME_TYPE, "audio/aac_mp4");
        cv.put(MediaStore.Audio.Media.ARTIST,
                res.getString(R.string.audio_db_artist_name));
        cv.put(MediaStore.Audio.Media.ALBUM,
@@ -1427,12 +1427,12 @@
 
    private void addToPlaylist(ContentResolver resolver, int audioId, long playlistId) {
        String[] cols = new String[] {
-               "count(*)"
+               MediaStore.Audio.Media.ALBUM_ID
        };
        Uri uri = MediaStore.Audio.Playlists.Members.getContentUri("external", playlistId);
        Cursor cur = resolver.query(uri, cols, null, null, null);
        final int base;
-       if (cur != null) {
+       if(cur != null && cur.getCount() != 0) {
             cur.moveToFirst();
             base = cur.getInt(0);
             cur.close();