commit 4bb2bb881eb0a419fcdb6494d11896edb53b55f7
author Sagar Verma <sagarv@codeaurora.org> Tue Oct 15 21:24:42 2019 +0530
committer nshrivas <nshrivas@codeaurora.org> Fri Oct 18 08:11:55 2019 -0700
tree ba9a5ae5dba4cdbaff60072f4afe9c011fb8ef1b
parent 5eb33357ab7e9111cd647f9b74d68ef4ed040b7c

AVRCP: AlbumName fix if MediaMetaData ALBUM key is empty

Some Players return AlbumName as empty string as their
MediaMetaData ALBUM key is null. For those look out for
ALBUM_ARTIST key for metadata update to Remote.

CRs-Fixed: 2543202
Change-Id: Ie53eeea91c7fb7fa7ff4d464f2ad70709872d952

packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java

diff --git a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
index 7491097..6a0ebc9 100644
--- a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
+++ b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
@@ -2116,6 +2116,11 @@
                 String CurrentPackageName = (mMediaController != null) ? mMediaController.getPackageName():null;
                 artistName = stringOrBlank(data.getString(MediaMetadata.METADATA_KEY_ARTIST));
                 albumName = stringOrBlank(data.getString(MediaMetadata.METADATA_KEY_ALBUM));
+                if (albumName.isEmpty()) {
+                  albumName =
+                      stringOrBlank(data.getString(MediaMetadata.METADATA_KEY_ALBUM_ARTIST));
+                  Log.d(TAG,"overwrite album_artist :" + albumName + "if album is blank");
+                }
                 if (CurrentPackageName != null && !(CurrentPackageName.equals("com.android.music"))) {
                     mediaNumber = longStringOrBlank((data.getLong(MediaMetadata.METADATA_KEY_TRACK_NUMBER)));
                 } else {
@@ -2125,7 +2130,7 @@
                 mediaTotalNumber = longStringOrBlank(data.getLong(MediaMetadata.METADATA_KEY_NUM_TRACKS));
                 genre = stringOrBlank(data.getString(MediaMetadata.METADATA_KEY_GENRE));
                 playingTimeMs = data.getLong(MediaMetadata.METADATA_KEY_DURATION);
-                if (DEBUG) Log.d(TAG," albumName :" + albumName + " device :" + device);
+                Log.d(TAG," albumName :" + albumName + " device :" + device);
                 if (mAvrcpBipRsp != null && device != null)
                     coverArt = stringOrBlank(mAvrcpBipRsp.getImgHandle(device, albumName));
                 else coverArt = stringOrBlank(null);