commit 864e04756ad8fe3ffff1c953470dc4d4822089d8
author Sagar Verma <sagarv@codeaurora.org> Thu Dec 06 15:39:43 2018 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Mar 19 00:46:06 2019 -0700
tree 4efb51ceae1c1d0155f0ffed847796728179184d
parent a5f2d8cabac61c423d1237d29eaabb1bb1c63813

AVRCP: Fix for NPE in buildBrowsablePlayerList

During preparing the Browsable Player list upon
BT On when we query ResolveInfo for Display name
of the package, sometimes there is NPE.

CRs-Fixed: 2357818
Change-Id: Ibc6c62c00486e74dcab34f95c1a98211b257fc19

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 413ccdb..a4cf61a 100644
--- a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
+++ b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
@@ -3630,7 +3630,9 @@
                         mPackageManager.queryIntentServices(intent, PackageManager.MATCH_ALL);
 
                 for (ResolveInfo info : playerList) {
-                    String displayableName = info.loadLabel(mPackageManager).toString();
+                    CharSequence displayName = info.loadLabel(mPackageManager);
+                    String displayableName =
+                            (displayName != null) ? displayName.toString():new String();
                     String serviceName = info.serviceInfo.name;
                     String packageName = info.serviceInfo.packageName;