Merge "BAapp: Remove shared BT UID from BA App" into bt.lnx.5.0
diff --git a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
index 5b5306c..cd83150 100644
--- a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
+++ b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
@@ -98,8 +98,6 @@
     private static final String TAG = "Avrcp_ext";
     private static final String ABSOLUTE_VOLUME_BLACKLIST = "absolute_volume_blacklist";
     private static final String AVRCP_VERSION_PROPERTY = "persist.bluetooth.avrcpversion";
-    private static final String AVRCP_1_4_STRING = "avrcp14";
-    private static final String AVRCP_1_5_STRING = "avrcp15";
     private static final String AVRCP_1_6_STRING = "avrcp16";
     private static final String AVRCP_NOTIFICATION_ID = "avrcp_notification";
 
@@ -563,8 +561,8 @@
             }
         }
 
-        String avrcpVersion = SystemProperties.get(AVRCP_VERSION_PROPERTY, AVRCP_1_4_STRING);
-        if (DEBUG) Log.d(TAG, "avrcpVersion: " + avrcpVersion);
+        String avrcpVersion = SystemProperties.get(AVRCP_VERSION_PROPERTY, AVRCP_1_6_STRING);
+        if (DEBUG) Log.d(TAG, "avrcpVersion " + avrcpVersion);
         /* Enable Cover Art support is version is 1.6 and flag is set in config */
         if (isCoverArtSupported && avrcpVersion != null &&
             avrcpVersion.equals(AVRCP_1_6_STRING))