commit d9651dc8c0e216efce431c39a6181c32c12d4768
author Linux Build Service Account <lnxbuild@localhost> Sat Mar 14 07:42:55 2020 -0700
committer Linux Build Service Account <lnxbuild@localhost> Sat Mar 14 07:42:55 2020 -0700
tree ead78549c6e790a5b68b2c4fd210287513e194ab
parent 6da77fae448130500d437c5c7c2532b6c4e11cda
parent ae098bfb357f5a5571a95235658f6db7ac9bfa58

Merge ae098bfb357f5a5571a95235658f6db7ac9bfa58 on remote branch

Change-Id: I7e12ce747f3bf2232d4901613ef9df98e723d220

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 e66b164..f8005cb 100644
--- a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
+++ b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
@@ -3980,16 +3980,15 @@
                         mPackageManager.queryIntentServices(intent, PackageManager.MATCH_ALL);
 
                 for (ResolveInfo info : playerList) {
-                    Log.d(TAG, "Fetch the displayName of package - start");
-                    CharSequence displayName = info.loadLabel(mPackageManager);
-                    Log.d(TAG, "Fetch the displayName of package - end");
-                    String displayableName =
-                            (displayName != null) ? displayName.toString():new String();
                     String serviceName = info.serviceInfo.name;
                     String packageName = info.serviceInfo.packageName;
-                    Log.d(TAG, "svc " + serviceName + " and pkg = " + packageName);
+                    Log.d(TAG, "Fetch the displayName of package - start");
+                    String displayName = getAppLabel(packageName);
+                    if (displayName == null) displayName = new String();
+                    Log.d(TAG, "Fetch the displayName of package -" + displayName + " end");
+                    Log.d(TAG, "svc " + serviceName + " pkg " + packageName);
                     BrowsePlayerInfo_ext currentPlayer =
-                            new BrowsePlayerInfo_ext(packageName, displayableName, serviceName);
+                            new BrowsePlayerInfo_ext(packageName, displayName, serviceName);
                     mBrowsePlayerInfoList.add(currentPlayer);
                     MediaPlayerInfo_ext playerInfo = getMediaPlayerInfo(packageName);
                     MediaController controller =

system_bt_ext/bta/tws_plus/ag/bta_ag_twsp_sco.cc

diff --git a/system_bt_ext/bta/tws_plus/ag/bta_ag_twsp_sco.cc b/system_bt_ext/bta/tws_plus/ag/bta_ag_twsp_sco.cc
index 849aa1c..4a22347 100644
--- a/system_bt_ext/bta/tws_plus/ag/bta_ag_twsp_sco.cc
+++ b/system_bt_ext/bta/tws_plus/ag/bta_ag_twsp_sco.cc
@@ -264,8 +264,13 @@
                     twsp_select_microphone(get_other_twsp_scb(p_scb->peer_addr), p_scb);
                 }
                 /* create sco connection to peer */
-                bta_ag_create_sco(p_scb, true);
-                p_sco->state = BTA_AG_SCO_OPENING_ST;
+                if (bta_ag_create_sco(p_scb, true)) {
+                    p_sco->state = BTA_AG_SCO_OPENING_ST;
+                } else {
+                    APPL_TRACE_WARNING("%s: create sco connection failed", __func__);
+                    p_sco->state = BTA_AG_SCO_LISTEN_ST;
+                    bta_ag_cback_sco(p_scb, BTA_AG_AUDIO_CLOSE_EVT);
+                }
             break;
             case BTA_AG_SCO_CONN_CLOSE_E:
                 //SCO failed back to LISTEN