Merge 44bfcdf93c0e79cf15fb56cb32e92bc065eb4015 on remote branch
Change-Id: Ia7be7814852484523f53b482b0a4e4eedf2e3cc0
diff --git a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
index 9dab1b3..250163d 100644
--- a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
+++ b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
@@ -41,8 +41,6 @@
import android.content.SharedPreferences;
import android.graphics.Color;
import android.media.AudioManager;
-import android.media.AudioDeviceCallback;
-import android.media.AudioDeviceInfo;
import android.media.AudioAttributes;
import android.media.AudioPlaybackConfiguration;
import android.media.MediaDescription;
@@ -180,18 +178,18 @@
public static final String VOLUME_MAP = "bluetooth_volume_map";
public static final String ABS_VOL_MAP = "bluetooth_ABS_VOL_map";
private boolean isShoActive = false;
- AudioManagerAudioDeviceCallback mAudioManagerAudioDeviceCallback;
private boolean twsShoEnabled = false;
byte[] dummyaddr = {(byte)0xFA, (byte)0xCE, (byte)0xFA,
(byte)0xCE, (byte)0xFA, (byte)0xCE};
- private boolean cache_play_cmd = false;
private static final String playerStateUpdateBlackListedAddr[] = {
"BC:30:7E", //bc-30-7e-5e-f6-27, Name: Porsche BT 0310; bc-30-7e-8c-22-cb, Name: Audi MMI 1193
+ "2C:DC:AD", //2C-DC-AD-BB-2F-25, Name: PORSCHE
"00:1E:43", //00-1e-43-14-f0-68, Name: Audi MMI 4365
"9C:DF:03", //9C:DF:03:D3:C0:17, Name: Benz S600L
"00:0A:08", //00:0A:08:51:1E:E7, Name: BMW530
"00:04:79", //00-04-79-00-06-bc, Name: radius HP-BTL01
"28:A1:83", //28-A1-83-94-90-AE, Name: VW Radio
+ "30:c3:d9", //30-c3-d9-8d-5b-83, Name: VW RadioBin
};
private static final String playerStateUpdateBlackListedNames[] = {
"Audi",
@@ -204,6 +202,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;
@@ -383,6 +386,7 @@
private int mLastPassthroughcmd;
private int mReportedPlayerID;
private boolean mTwsPairDisconnected;
+ private boolean cache_play_cmd;
public DeviceDependentFeature(Context context) {
mContext = context;
mCurrentDevice = null;
@@ -426,6 +430,7 @@
mLastPassthroughcmd = KeyEvent.KEYCODE_UNKNOWN;
mReportedPlayerID = NO_PLAYER_ID;
mTwsPairDisconnected = false;
+ cache_play_cmd = false;
}
};
DeviceDependentFeature[] deviceFeatures;
@@ -621,8 +626,6 @@
mAudioManager.registerAudioPlaybackCallback(
mAudioManagerPlaybackCb, mAudioManagerPlaybackHandler);
- mAudioManagerAudioDeviceCallback = new AudioManagerAudioDeviceCallback();
- mAudioManager.registerAudioDeviceCallback(mAudioManagerAudioDeviceCallback, mHandler);
changePathDepth = 0;
changePathFolderType = 0;
changePathDirection = 0;
@@ -820,6 +823,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) {
@@ -1332,11 +1347,6 @@
* retry a volume one step up/down */
if (DEBUG) Log.d(TAG, "Remote device didn't tune volume, let's try one more step.");
/* direction calculation for retry mechanism */
- if(convertToAudioStreamVolume(deviceFeatures[deviceIndex].mLastRemoteVolume)
- < deviceFeatures[deviceIndex].mLocalVolume)
- deviceFeatures[deviceIndex].mLastDirection = -1;
- else
- deviceFeatures[deviceIndex].mLastDirection = 1;
int retry_volume = Math.min(AVRCP_MAX_VOL,
Math.max(0, deviceFeatures[deviceIndex].mLastRemoteVolume +
deviceFeatures[deviceIndex].mLastDirection));
@@ -1347,7 +1357,6 @@
0, 0, deviceFeatures[deviceIndex].mCurrentDevice), CMD_TIMEOUT_DELAY);
deviceFeatures[deviceIndex].mVolCmdAdjustInProgress = true;
}
- deviceFeatures[deviceIndex].mLastDirection = 0;
} else if (msg.arg2 == AVRC_RSP_REJ) {
if (DEBUG)
Log.v(TAG, "setAbsoluteVolume call rejected");
@@ -1397,6 +1406,10 @@
CMD_TIMEOUT_DELAY);
deviceFeatures[deviceIndex].mVolCmdSetInProgress = true;
deviceFeatures[deviceIndex].mLastRemoteVolume = avrcpVolume;
+ if(deviceFeatures[deviceIndex].mLastLocalVolume > msg.arg1)
+ deviceFeatures[deviceIndex].mLastDirection = -1;
+ else
+ deviceFeatures[deviceIndex].mLastDirection = 1;
deviceFeatures[deviceIndex].mLastLocalVolume = msg.arg1;
deviceFeatures[deviceIndex].mLastRequestedVolume = -1;
} else {
@@ -1711,6 +1724,9 @@
break;
}
deviceFeatures[deviceIndex].isActiveDevice = true;
+ if (deviceFeatures[deviceIndex].cache_play_cmd) {
+ process_cached_play(deviceIndex);
+ }
if (mFastforward) mFastforward = false;
if (mRewind) mRewind = false;
@@ -1809,31 +1825,9 @@
}
}
- private class AudioManagerAudioDeviceCallback extends AudioDeviceCallback {
- @Override
- public void onAudioDevicesAdded(AudioDeviceInfo[] addedDevices) {
- Log.i(TAG,"onAudioDevicesAdded");
- for (int i = 0; i < addedDevices.length; i++) {
- if (addedDevices[i].getType() == AudioDeviceInfo.TYPE_BLUETOOTH_A2DP) {
- int index = getActiveDeviceIndex();
- String addr = null;
- if (index != INVALID_DEVICE_INDEX) {
- addr = deviceFeatures[index].mCurrentDevice.getAddress();
- }
- if (addr != null && cache_play_cmd &&
- Objects.equals(addr, addedDevices[i].getAddress())) {
- cache_play_cmd = false;
- process_cached_play();
- }
- //clear cache play cmd unconditionally
- cache_play_cmd = false;
- }
- }
- }
- }
- private void process_cached_play() {
+ private void process_cached_play(int index) {
Log.d(TAG,"process_cached_play");
- int index = getActiveDeviceIndex();
+ deviceFeatures[index].cache_play_cmd = false;
handlePassthroughCmd(getByteAddress(deviceFeatures[index].mCurrentDevice),
BluetoothAvrcp.PASSTHROUGH_ID_PLAY,
AvrcpConstants_ext.KEY_STATE_PRESS);
@@ -3880,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.
@@ -3916,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;
}
@@ -3944,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;
@@ -4108,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) {
@@ -4730,6 +4723,7 @@
deviceFeatures[index].mBlackListVolume = -1;
deviceFeatures[index].mLastRemoteVolume = -1;
deviceFeatures[index].mLastLocalVolume = -1;
+ deviceFeatures[index].cache_play_cmd = false;
}
private void onConnectionStateChanged(
@@ -5518,8 +5512,9 @@
if (a2dp_active_device == null &&
code == KeyEvent.KEYCODE_MEDIA_PLAY) {
if (action == KeyEvent.ACTION_DOWN) {
- cache_play_cmd = true;
- } else if (action == KeyEvent.ACTION_UP && cache_play_cmd) {
+ deviceFeatures[deviceIndex].cache_play_cmd = true;
+ } else if (action == KeyEvent.ACTION_UP &&
+ deviceFeatures[deviceIndex].cache_play_cmd) {
Log.d(TAG,"play cmd cached, ignore release");
}
}
@@ -5530,7 +5525,7 @@
mAudioManager.isMusicActive() &&
(mA2dpState == BluetoothA2dp.STATE_PLAYING)) {
ignore_play = true;
- cache_play_cmd = false;
+ deviceFeatures[deviceIndex].cache_play_cmd = false;
}
if (action == KeyEvent.ACTION_DOWN) {
Log.d(TAG, "AVRCP Trigger Handoff");
@@ -5558,8 +5553,8 @@
Log.d(TAG, "ignore_play: " + ignore_play + " since another PT came before play release");
}
- if (cache_play_cmd) {
- Log.d(TAG,"caching play cmd");
+ if (deviceFeatures[deviceIndex].cache_play_cmd) {
+ Log.d(TAG,"cached play cmd exist, process it when a2dp device become active");
return;
}
diff --git a/packages_apps_bluetooth_ext/src/map/src/BluetoothMapCommonUtils.java b/packages_apps_bluetooth_ext/src/map/src/BluetoothMapCommonUtils.java
index ffb21cb..b326526 100644
--- a/packages_apps_bluetooth_ext/src/map/src/BluetoothMapCommonUtils.java
+++ b/packages_apps_bluetooth_ext/src/map/src/BluetoothMapCommonUtils.java
@@ -46,6 +46,8 @@
protected static String TAG = "BluetoothMapCommonUtils";
+ static final String EMAIL_UI_PKG = "com.android.email";
+
public static class BMsgReaderExt extends BluetoothMapbMessage.BMsgReader{
public BMsgReaderExt(InputStream is)
diff --git a/packages_apps_bluetooth_ext/src/map/src/BluetoothMapContentEmail.java b/packages_apps_bluetooth_ext/src/map/src/BluetoothMapContentEmail.java
index 655fbf1..dd43299 100644
--- a/packages_apps_bluetooth_ext/src/map/src/BluetoothMapContentEmail.java
+++ b/packages_apps_bluetooth_ext/src/map/src/BluetoothMapContentEmail.java
@@ -247,7 +247,7 @@
} else {
sent = "no";
}
- if (V) Log.d(TAG, "setSent: " + sent);
+ if (V) Log.v(TAG, "setSent: " + sent);
e.setSent(sent);
}
}
@@ -261,7 +261,7 @@
}
String setread = null;
- if (V) Log.d(TAG, "setRead: " + setread);
+ if (V) Log.v(TAG, "setRead: " + setread);
e.setRead((read==1?true:false), ((ap.getParameterMask() & MASK_READ) != 0));
}
/**
@@ -281,15 +281,15 @@
//ATTACHMENT DB
Uri attchmntUri = BluetoothMapEmailContract
.buildEmailAttachmentUri(BluetoothMapEmailContract.EMAIL_AUTHORITY);
- Log.d(TAG, "attchURI: "+attchmntUri);
+ if (V) Log.v(TAG, "attchURI: "+attchmntUri);
String whereAttch = setWhereFilterMessagekey(
c.getLong(fi.mMessageColId));
- Log.d(TAG, "whereAttch: "+whereAttch+" handle: "
+ if (V) Log.v(TAG, "whereAttch: "+whereAttch+" handle: "
+ c.getLong(fi.mMessageColId));
Cursor emailAttachmentCursor = mResolver.query(attchmntUri,
BluetoothMapEmailContract.BT_EMAIL_ATTACHMENT_PROJECTION,
whereAttch, null, null);
- Log.d(TAG, "Found " + emailAttachmentCursor.getCount() + " size messages.");
+ if (V) Log.v(TAG, "Found " + emailAttachmentCursor.getCount() + " size messages.");
fi.setEmailAttachmentColumns(emailAttachmentCursor);
if(emailAttachmentCursor != null) {
if( emailAttachmentCursor.moveToNext()) {
@@ -297,7 +297,7 @@
}
emailAttachmentCursor.close();
emailAttachmentCursor = null;
- Log.d(TAG, "size: "+size);
+ if (V) Log.v(TAG, "size: "+size);
}
if(attachment == 1 && size == 0) {
if (D) Log.d(TAG, "Error in message database, attachment size reported as: "
@@ -307,7 +307,7 @@
report a size */
}
}
- if (V) Log.d(TAG, "setAttachmentSize: " + size + "\n" +
+ if (D) Log.d(TAG, "setAttachmentSize: " + size + "\n" +
"setAttachmentMimeTypes: " + attachmentMimeTypes );
e.setAttachmentSize(size);
}
@@ -320,7 +320,7 @@
if (fi.mMsgType == FilterInfo.TYPE_EMAIL ) {
hasText = "yes";
}
- if (V) Log.d(TAG, "setText: " + hasText);
+ if (V) Log.v(TAG, "setText: " + hasText);
e.setText(hasText);
}
}
@@ -353,7 +353,7 @@
BluetoothMapEmailContract.EmailBodyColumns.TEXT_CONTENT_URI));
if (textContentURI != null ) {
try {
- Log.v(TAG, " TRY EMAIL BODY textURI " + textContentURI);
+ if(V) Log.v(TAG, " setSize textContentURI " + textContentURI);
fd = mResolver.openFileDescriptor(Uri.parse(textContentURI), "r");
} catch (FileNotFoundException ex) {
if(V) Log.w(TAG, ex);
@@ -365,7 +365,7 @@
.EmailBodyColumns.HTML_CONTENT_URI));
if (htmlContentURI != null ) {
try {
- Log.v(TAG, " TRY EMAIL BODY htmlURI " + htmlContentURI);
+ if(V) Log.v(TAG, " setSize htmlContentURI " + htmlContentURI);
fd = mResolver.openFileDescriptor(Uri.parse(htmlContentURI), "r");
} catch (FileNotFoundException ex) {
if(V) Log.w(TAG, ex);
@@ -400,18 +400,17 @@
+ " Changing size to 1");
size = 1;
}
- if (V) Log.d(TAG, "setSize: " + size);
+ if (V) Log.v(TAG, "setSize: " + size);
e.setSize(size);
}
}
private TYPE getType(Cursor c, FilterInfo fi) {
TYPE type = null;
- if (V) Log.d(TAG, "getType: for filterMsgType" + fi.mMsgType);
if (fi.mMsgType == FilterInfo.TYPE_EMAIL) {
type = TYPE.EMAIL;
}
- if (V) Log.d(TAG, "getType: " + type);
+ if (V) Log.v(TAG, "getType: " + type+", filterMsgType : " + fi.mMsgType);
return type;
}
@@ -423,7 +422,7 @@
if (fi.mMsgType == FilterInfo.TYPE_EMAIL) {
// TODO: need to find name from id and then set folder type
}
- if (V) Log.d(TAG, "setFolderType: " + folderType);
+ if (V) Log.v(TAG, "setFolderType: " + folderType);
e.setFolderType(folderType);
}
}
@@ -564,7 +563,7 @@
FilterInfo fi, BluetoothMapAppParams ap) {
if ((ap.getParameterMask() & MASK_PROTECTED) != 0) {
String protect = "no";
- if (V) Log.d(TAG, "setProtected: " + protect + "\n");
+ if (V) Log.v(TAG, "setProtected: " + protect);
e.setProtect(protect);
}
}
@@ -710,7 +709,7 @@
} else if(subject == null ) {
subject = "";
}
- if (V) Log.d(TAG, "setSubject: " + subject);
+ if (V) Log.v(TAG, "setSubject: " + subject);
e.setSubject(subject);
}
}
@@ -721,7 +720,7 @@
if (fi.mMsgType == FilterInfo.TYPE_EMAIL) {
handle = c.getLong(fi.mMessageColId);
}
- if (V) Log.d(TAG, "setHandle: " + handle );
+ if (V) Log.v(TAG, "setHandle: " + handle );
e.setHandle(handle);
}
@@ -1034,7 +1033,8 @@
long id = c.getLong(c.getColumnIndex(BluetoothMapContract.FolderColumns._ID));
int type = c.getInt(c.getColumnIndex(BluetoothMapEmailContract.MailBoxColumns
.FOLDER_TYPE));
- Log.d(TAG, "addEmailFolders(): id: "+id+ " Name: " + name + "Type: " + type);
+ if (V) Log.v(TAG, "addEmailFolders id: " + id + " Name: " + name
+ + "Type: " + type);
newFolder = parentFolder.addEmailFolder(name, id);
newFolder.setFolderType(type);
addEmailFolders(newFolder); // Use recursion to add any sub folders
@@ -1055,6 +1055,8 @@
Intent emailIn = new Intent();
emailIn.setAction(BluetoothMapEmailContract.ACTION_CHECK_MAIL);
emailIn.putExtra(BluetoothMapEmailContract.EXTRA_ACCOUNT, accountId);
+ emailIn.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+ emailIn.setPackage(BluetoothMapCommonUtils.EMAIL_UI_PKG);
mContext.sendBroadcast(emailIn);
}
diff --git a/packages_apps_bluetooth_ext/src/map/src/BluetoothMapContentObserverEmail.java b/packages_apps_bluetooth_ext/src/map/src/BluetoothMapContentObserverEmail.java
index a99f7a0..95434ba 100644
--- a/packages_apps_bluetooth_ext/src/map/src/BluetoothMapContentObserverEmail.java
+++ b/packages_apps_bluetooth_ext/src/map/src/BluetoothMapContentObserverEmail.java
@@ -128,7 +128,7 @@
private boolean mObserverRegistered = false;
private BluetoothMapAccountItem mAccount;
private String mAuthority = null;
-
+ private String mEmailPackage = "";
// Default supported feature bit mask is 0x1f
private int mMapSupportedFeatures = BluetoothMapUtils.MAP_FEATURE_DEFAULT_BITMASK;
// Default event report version is 1.0
@@ -231,6 +231,7 @@
}
mEnableSmsMms = enableSmsMms;
mMnsClient = mnsClient;
+ mEmailPackage = BluetoothMapCommonUtils.EMAIL_UI_PKG;
}
private Map<Long, Msg> getMsgListMsg() {
@@ -265,9 +266,10 @@
| BluetoothMapUtils.MAP_FEATURE_PARTICIPANT_CHAT_STATE_CHANGE_BIT)
& mMapSupportedFeatures) != 0) {
// Warning according to page 46/123 of MAP 1.3 spec
- Log.w(TAG, "setObserverRemoteFeatureMask: Extended Event Reports 1.2 is not set even"
- + "though PARTICIPANT_PRESENCE_CHANGE_BIT or PARTICIPANT_CHAT_STATE_CHANGE_BIT"
- + " were set, mMapSupportedFeatures=" + mMapSupportedFeatures);
+ if (V) {
+ Log.w(TAG, "Event Reports 1.2 is not set even though PARTICIPANT_PRESENCE_"
+ + "CHANGE_BIT or PARTICIPANT_CHAT_STATE_CHANGE_BIT were set");
+ }
}
if (D) {
Log.d(TAG, "setObserverRemoteFeatureMask: mMapEventReportVersion="
@@ -562,8 +564,8 @@
}
sendEvent(evt);
} else {
- if(V) Log.v(TAG, "handleMsgListChangesMsg id: " + id + "folderId: "
- + folderId + " newFolder: " +newFolder + "oldFolder: "
+ if(V) Log.v(TAG, "handleMsgListChangesMsg id: " + id + ", folderId: "
+ + folderId + ", newFolder: " +newFolder + ", oldFolder: "
+ msg.folderId);
/* Existing message */
if (folderId != msg.folderId && msg.folderId != -1) {
@@ -728,17 +730,17 @@
*/
public boolean setMessageStatusDeleted(long handle, TYPE type,
BluetoothMapFolderElement mCurrentFolder, String uriStr, int statusValue) {
- if (D) Log.d(TAG, "setMessageStatusDeleted: EMAIL handle " + handle
+ if (D) Log.d(TAG, "setMessageStatusDeleted: handle " + handle
+ " type " + type + " value " + statusValue + " URI: " +uriStr);
boolean res = false;
long accountId = mAccount.getAccountId();
Uri uri = Uri.withAppendedPath(mMessageUri, Long.toString(handle));
- Log.d(TAG,"URI print: " + uri.toString());
+ if (D) Log.d(TAG,"URI print: " + uri.toString());
Cursor crEmail = mResolver.query(uri, null, null, null, null);
if (crEmail != null && crEmail.moveToFirst()) {
- if (V) Log.d(TAG, "setMessageStatusDeleted: EMAIL handle " + handle
- + " type " + type + " value " + statusValue + "accountId: "+accountId);
+ if (V) Log.v(TAG, "setMessageStatusDeleted: handle " + handle
+ + " type " + type + " value " + statusValue + "accountId: " + accountId);
Intent emailIn = new Intent();
Msg msg = null;
synchronized(getMsgListMsg()) {
@@ -748,15 +750,14 @@
emailIn.setAction(BluetoothMapEmailContract.ACTION_DELETE_MESSAGE);
} else {
emailIn.setAction(BluetoothMapEmailContract.ACTION_MOVE_MESSAGE);
- //Undelete - Move the message to Inbox
- long folderId = -1;
- BluetoothMapFolderElement inboxFolder = mCurrentFolder
- .getFolderByName(BluetoothMapContract.FOLDER_NAME_INBOX);
+ int folderId = mCurrentFolder.getFolderType();
if(folderId == -1) folderId = BluetoothMapEmailContract.TYPE_INBOX;
emailIn.putExtra(BluetoothMapEmailContract.EXTRA_MESSAGE_INFO, folderId);
}
emailIn.putExtra(BluetoothMapEmailContract.EXTRA_ACCOUNT, accountId);
emailIn.putExtra(BluetoothMapEmailContract.EXTRA_MESSAGE_ID, handle);
+ emailIn.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+ emailIn.setPackage(mEmailPackage);
mContext.sendBroadcast(emailIn);
res = true;
//Mark local initiated message delete to avoid notification
@@ -767,8 +768,8 @@
if (crEmail != null) {
crEmail.close();
}
- if(V) Log.d(TAG, " END setMessageStatusDeleted: EMAIL handle " + handle + " type " + type
- + " value " + statusValue + "accountId: "+accountId);
+ if(V) Log.v(TAG, " END setMessageStatusDeleted: handle " + handle + " type " + type
+ + " value " + statusValue + "accountId: " + accountId);
return res;
}
@@ -797,6 +798,8 @@
emailIn.putExtra(BluetoothMapEmailContract.EXTRA_MESSAGE_INFO,statusValue);
emailIn.putExtra(BluetoothMapEmailContract.EXTRA_ACCOUNT, accountId);
emailIn.putExtra(BluetoothMapEmailContract.EXTRA_MESSAGE_ID, handle);
+ emailIn.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+ emailIn.setPackage(mEmailPackage);
//Mark local initiage message status change to avoid notification
if (msg != null ) msg.localInitiatedReadStatus = true;
mContext.sendBroadcast(emailIn);
@@ -992,6 +995,8 @@
if(V) Log.d(TAG, "sendIntent SEND: " + handle + "accounId: " +accountId);
emailIn.setAction(BluetoothMapEmailContract.ACTION_SEND_PENDING_MAIL);
emailIn.putExtra(BluetoothMapEmailContract.EXTRA_ACCOUNT, accountId);
+ emailIn.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+ emailIn.setPackage(mEmailPackage);
mContext.sendBroadcast(emailIn);
}
getMsgListMsg().put(handle, newMsg);
diff --git a/system_bt_ext/bta/tws_plus/ag/bta_ag_twsp_dev.cc b/system_bt_ext/bta/tws_plus/ag/bta_ag_twsp_dev.cc
index 8000abb..5b56e48 100644
--- a/system_bt_ext/bta/tws_plus/ag/bta_ag_twsp_dev.cc
+++ b/system_bt_ext/bta/tws_plus/ag/bta_ag_twsp_dev.cc
@@ -408,6 +408,21 @@
}
}
}
+ } else if (state == TWSPLUS_EB_STATE_INEAR) {
+ if (get_lat_selected_mic_eb_role() != twsp_devices[eb_idx].role) {
+ tBTA_AG_SCB *p_scb = twsp_devices[eb_idx].p_scb;
+ APPL_TRACE_DEBUG("%s: current earbud is not selected mic eb", __func__);
+ if (p_scb != NULL) {
+ tBTA_AG_SCB *peer_scb = get_other_twsp_scb(p_scb->peer_addr);
+ if (peer_scb == NULL ||
+ get_twsp_state(peer_scb) != TWSPLUS_EB_STATE_INEAR) {
+ //Trigger Microphone Switch while the other EB is not IN EAR
+ select_microphone_path(p_scb);
+ } else {
+ APPL_TRACE_DEBUG("%s: both earbuds are IN EAR, No mic switch", __func__);
+ }
+ }
+ }
}
}