Avoid non-Media blacklisted apps to set active media session.
Some non-Media apps like telecom and skype were added as
media players while player list is initialised at BT turn on.
Due to this such non-Media apps could set active media
session if they are active (having UI and/or audio focus).
Due to this avrcp assumed such app is an addressed player
leading to issues like avrcp PT keys not sent to media player,
PlayItem not working etc.
The fix avoids these non-Media apps to be added as list of
media player and also ignore their request to be set as
active media session.
CRs-Fixed: 2570980
Change-Id: I28ad1bf7b534742faa395103bca7d6c80431cd34
diff --git a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
index ee4f508..c680eac 100644
--- a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
+++ b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
@@ -200,6 +200,11 @@
"com.google.android.music"
));
+ private static final String nonMediaAppsBlacklistedNames[] = {
+ "telecom",
+ "skype"
+ };
+
/* UID counter to be shared across different files. */
static short sUIDCounter = AvrcpConstants_ext.DEFAULT_UID_COUNTER;
@@ -816,6 +821,18 @@
}
return false;
};
+
+ private boolean isAppBlackListedForMediaSessionUpdate(String appName) {
+ if (appName == null) return false;
+ for (int j = 0; j < nonMediaAppsBlacklistedNames.length; j++) {
+ String name = nonMediaAppsBlacklistedNames[j];
+ if (appName.toLowerCase().contains(name.toLowerCase())) {
+ Log.d(TAG, "AVRCP non Media app BL for media session update: " + appName);
+ return true;
+ }
+ }
+ return false;
+ };
/** Handles Avrcp messages. */
private final class AvrcpMessageHandler extends Handler {
private AvrcpMessageHandler(Looper looper) {
@@ -3857,8 +3874,8 @@
updateCurrentController(0, mCurrBrowsePlayerID);
return;
}
- if (packageName.equals("com.android.server.telecom")) {
- Log.d(TAG, "Ignore addressed media session change to telecom");
+ if (isAppBlackListedForMediaSessionUpdate(packageName)) {
+ Log.d(TAG, "Ignore addressed media session change to " + packageName);
return;
}
// No change.
@@ -3893,9 +3910,8 @@
private void setActiveMediaSession(MediaSession.Token token) {
android.media.session.MediaController activeController =
new android.media.session.MediaController(mContext, token);
- if ((activeController.getPackageName().contains("telecom")) ||
- (activeController.getPackageName().contains("skype"))) {
- Log.d(TAG, "Ignore active media session change to telecom/skype");
+ if (isAppBlackListedForMediaSessionUpdate(activeController.getPackageName())) {
+ Log.d(TAG, "Ignore active media session change to " + activeController.getPackageName());
return;
}
@@ -3921,7 +3937,7 @@
private void setActiveMediaSession(android.media.session.MediaController mController) {
HeadsetService mService = HeadsetService.getHeadsetService();
- if (mController.getPackageName().contains("telecom")) {
+ if (isAppBlackListedForMediaSessionUpdate(mController.getPackageName())) {
if (mService != null && mService.isScoOrCallActive()) {
Log.w(TAG, "Ignore media session during call");
return;
@@ -4085,8 +4101,8 @@
int updateId = -1;
boolean updated = false;
boolean currentRemoved = false;
- if (info.getPackageName().equals("com.android.server.telecom")) {
- Log.d(TAG, "Skip adding telecom to the media player info list");
+ if (isAppBlackListedForMediaSessionUpdate(info.getPackageName())) {
+ Log.d(TAG, "Skip adding to the media player info list " + info.getPackageName());
return updated;
}
synchronized (this) {