OSDN Git Service
Smriti Gupta [Wed, 23 Mar 2016 20:48:20 +0000 (20:48 +0000)]
Merge "PBAPS: Fix duplicate entries fetched from database"
am:
78a09e1 -s ours
* commit '
78a09e158e4b922c807fd56666834c9d7474c9ed':
PBAPS: Fix duplicate entries fetched from database
Ajay Panicker [Wed, 23 Mar 2016 20:35:16 +0000 (13:35 -0700)]
Remove duplicate scan event definitions
Change-Id: I94c9e308101a56438212fc0305202ed719579d84
(cherry picked from commit
5bd9ecab4094b4873359463dc21af30410f3d448)
Andre Eisenbach [Wed, 23 Mar 2016 19:32:42 +0000 (19:32 +0000)]
Merge "resolve merge conflicts of
c90db0f to nyc-dev-plus-aosp" into nyc-dev-plus-aosp
Sanket Agarwal [Wed, 23 Mar 2016 19:32:21 +0000 (19:32 +0000)]
Merge "Add Android.mk so that underneath targets can be updated." into nyc-dev
am:
8d09b9d
* commit '
8d09b9d54cfc6459188ee74d95be9ebdddfe9b3b':
Add Android.mk so that underneath targets can be updated.
Ajay Panicker [Wed, 23 Mar 2016 19:32:21 +0000 (19:32 +0000)]
Add scan results to scan stats
am:
e90db93
* commit '
e90db937c008f365f47e7199d6d86f9eb13bed1e':
Add scan results to scan stats
Andre Eisenbach [Wed, 23 Mar 2016 19:31:58 +0000 (12:31 -0700)]
resolve merge conflicts of
c90db0f to nyc-dev-plus-aosp
Change-Id: Id0969c26659549c31f2947bede8c55bf7d366688
Sanket Agarwal [Wed, 23 Mar 2016 19:23:02 +0000 (19:23 +0000)]
Merge "Add Android.mk so that underneath targets can be updated." into nyc-dev
Ajay Panicker [Wed, 9 Mar 2016 03:54:18 +0000 (19:54 -0800)]
Add scan results to scan stats
Ex:
GATT Client Map
Entries: 1
no.nordicsemi.android.mcp
LE scans (started/stopped) : 3 / 3
Scan time in ms (min/max/avg/total): 3050 / 6901 / 4815 / 14447
Total number of results : 338
Last 3 scans :
1970/01/01 08:20:06 - 6901ms 0 results
1970/01/01 08:20:13 - 4496ms 171 results
1970/01/01 08:20:39 - 3050ms 167 results
Bug:
27294154
Change-Id: I32fd6da035f2c37302a105733ac6a9817547b7a3
Hemant Gupta [Wed, 23 Mar 2016 19:02:19 +0000 (19:02 +0000)]
Merge "PBAPS: Enable contact search with full or part of given string"
am:
4cece2c
* commit '
4cece2cfd1350ba525cb7058e7f80eee01cb2d0b':
PBAPS: Enable contact search with full or part of given string
Hemant Gupta [Wed, 23 Mar 2016 18:54:34 +0000 (18:54 +0000)]
Merge "SAP: Fix ANR(s) in SAP server code"
am:
2f224e9
* commit '
2f224e914e86bec65acd61ed2baadd2dea972ab0':
SAP: Fix ANR(s) in SAP server code
Andre Eisenbach [Wed, 23 Mar 2016 18:53:30 +0000 (18:53 +0000)]
Merge "PBAPS: Fix duplicate entries fetched from database"
Smriti Gupta [Mon, 30 Nov 2015 12:45:14 +0000 (18:15 +0530)]
PBAPS: Fix duplicate entries fetched from database
Precondition
================
Have multple contacts with either same number or name in DUT
Steps to reproduce:
===================
1. Perform BT pairing from DUT->RD<1>
2. Search for name from remote.
Expected Result:
================
Single entry with the name should be returned
Actual Result:
==============
Single name entry with different numbers are duplicating
Fix
========
This patch will remove the duplicate entries having same handle
and name fetched from the database sometimes. The check was
there in the stock code but that was not sufficient and was
comparing with the previous value only if these are duplicates
and not with the whole list. I have updated this check to
compare the fetched value if the exact duplicate value
(same ID and NAME) is present in the final list of contacts
which is to be returned.
Change-Id: If32526076baed813d39ce298c307196b63bc46fd
Andre Eisenbach [Wed, 23 Mar 2016 18:51:02 +0000 (18:51 +0000)]
Merge "PBAPS: Get vcard when asked in alphabetical order"
Hemant Gupta [Mon, 23 Nov 2015 11:08:05 +0000 (16:38 +0530)]
PBAPS: Get vcard when asked in alphabetical order
Precondition:
=============
- PSE should have atleast 40 contacts with all alphabetical permutations
Step by Step procedure:
=======================
1. Establish PBAP session. Navigate to "Browse" Tab
2. Select telecom/pb.vcf on remote device and select "SETPHONEBOOK"
3. Select "Get Size" from remote device
4. Select default sorting, maxlistcount = 5000 and click "Search" to
browse phonebook
5. Select "Alphabetical" sorting, maxlistcount = 5000 and click "Search"
to browse phonebook
Actual Result
============================
After alphabetical sorting the contacts are displayed according to index
but not with sorted request
Expected result:
=========================
When contacts are sorted according to alphabets the contact info should
also be displayed according to contacts.
Root Cause:
========================
While quering vcard entry from database, proper checks of the order (indexed/alphabetical)
was not there in M Stock code compared to L Stock code.
Change-Id: Ie7990992b4dd22add3526aa0050121e680567bb8
Hemant Gupta [Wed, 23 Mar 2016 18:50:33 +0000 (18:50 +0000)]
Merge "SAP: Remove sdp record while BT is being turned off to prevent leak"
am:
a51595c
* commit '
a51595cc0ea0b9d5e050b77e90fd4cdec512dc56':
SAP: Remove sdp record while BT is being turned off to prevent leak
Hemant Gupta [Wed, 23 Mar 2016 18:50:33 +0000 (18:50 +0000)]
Merge "SAP: Fix issue of socket listener not getting re-started"
am:
8731128
* commit '
8731128aa44e55278412647d60979a0643f32479':
SAP: Fix issue of socket listener not getting re-started
Hemant Gupta [Wed, 23 Mar 2016 18:50:33 +0000 (18:50 +0000)]
Merge "SAP: Update UI connection and notifications properly"
am:
61f1405
* commit '
61f1405379888a6a3c6380e834243be4fd215f54':
SAP: Update UI connection and notifications properly
Hemant Gupta [Wed, 23 Mar 2016 18:50:33 +0000 (18:50 +0000)]
Merge "SAP: Handle disconnect request during call ongoing state"
am:
02be62d
* commit '
02be62dd6c903bb5fd6043a055cecee3ddbb2c3d':
SAP: Handle disconnect request during call ongoing state
Andre Eisenbach [Wed, 23 Mar 2016 18:48:54 +0000 (18:48 +0000)]
Merge "PBAPS: Enable contact search with full or part of given string"
Hemant Gupta [Mon, 7 Mar 2016 08:12:52 +0000 (13:42 +0530)]
PBAPS: Enable contact search with full or part of given string
Enables searching of text in contact name starting with a given
matching string instead of matching the complete string.
Change-Id: I91258391b7b7cb014d55e17e1ed3b92267a2c7da
Andre Eisenbach [Wed, 23 Mar 2016 18:46:59 +0000 (18:46 +0000)]
Merge "SAP: Fix ANR(s) in SAP server code"
Hemant Gupta [Mon, 7 Mar 2016 07:16:04 +0000 (12:46 +0530)]
SAP: Fix ANR(s) in SAP server code
Fix ANR in SAP Server code in following scenarios:
- Multiple call to stop in Sapservice leads to ANR, as check was not
present in stop to prevent unregistering BroadcastReceiver if not
already registred.
- Remove redundant call to closeServerSocket from initSocket as this could
lead to ANR when there is simultaneous call to closeService as part of BT
being switched off and call to start SAP as part of BT being turned on when
BT on off sequence is tried repeatedly.
Change-Id: Ia6bc5ca7c9da9ae4a4c12e8207fb9ff6b9159e82
Andre Eisenbach [Wed, 23 Mar 2016 18:44:04 +0000 (18:44 +0000)]
Merge "SAP: Remove sdp record while BT is being turned off to prevent leak"
Hemant Gupta [Mon, 7 Mar 2016 07:11:14 +0000 (12:41 +0530)]
SAP: Remove sdp record while BT is being turned off to prevent leak
Remove sdp record created dynamically for SAP server during BT off state.
Without this call, there is leak in sdp layer in stack as sdp record is
never removed, even though the socket is closed.
Also proper checks are added to prevent call to remove sdp record when
adapter is null.
Change-Id: I739cc3115f6cd7fedf9085e8522c96da257e9568
Andre Eisenbach [Wed, 23 Mar 2016 18:43:12 +0000 (18:43 +0000)]
Merge "SAP: Fix issue of socket listener not getting re-started"
Hemant Gupta [Mon, 7 Mar 2016 05:49:44 +0000 (11:19 +0530)]
SAP: Fix issue of socket listener not getting re-started
Add logic to properly handle ACL_DISCONNECTED to restart socketListener
to handle scenarios where socket listener was not getting started due to
abnormal ACL disconnect.
Change-Id: Iac5ec52f485e692b14bb0065e30a68cae007a49d
Andre Eisenbach [Wed, 23 Mar 2016 18:42:17 +0000 (18:42 +0000)]
Merge "SAP: Update UI connection and notifications properly"
Hemant Gupta [Mon, 7 Mar 2016 05:39:41 +0000 (11:09 +0530)]
SAP: Update UI connection and notifications properly
Update connection state to upper layers only when SAP SLC is connected
i.e. status indication is sent to SAP Client.
Also notification to disconnect SAP Server from UI is shown only when SAP
is successfully connected, and not when SapServer object is created.
Change-Id: Iaf40584220b51f6193bed9a54d159cffd32698e9
Andre Eisenbach [Wed, 23 Mar 2016 18:40:36 +0000 (18:40 +0000)]
Merge "SAP: Handle disconnect request during call ongoing state"
Hemant Gupta [Mon, 7 Mar 2016 05:14:52 +0000 (10:44 +0530)]
SAP: Handle disconnect request during call ongoing state
Handle disconnect request during call ongoing state properly.
Previously if disconnect was received from SAP client while in
call ongoing state, it was not handled properly, leading to
Server not sending the DISCONNECT response thereby violating
Bluetooth SAP Specification.
Change-Id: I666fab4b4513abfa00df4be5b3a7aab95d5f0331
Hemant Gupta [Wed, 23 Mar 2016 18:39:01 +0000 (18:39 +0000)]
Merge "OPP: Update share status when interrupted at remote side."
am:
f4de2e0
* commit '
f4de2e0631c0a2f553c27b2351c0d13fba481466':
OPP: Update share status when interrupted at remote side.
Hemant Gupta [Wed, 23 Mar 2016 18:39:01 +0000 (18:39 +0000)]
Merge "OPP: Use long instead of int"
am:
245367e
* commit '
245367e89200c59be5d65959e10e0a91a13dc288':
OPP: Use long instead of int
Hemant Gupta [Wed, 23 Mar 2016 18:39:00 +0000 (18:39 +0000)]
Merge "MAP: Fix ANR for blocking operations on UI thread"
am:
5c20542
* commit '
5c205429a8003a68fd189915c5265296388b9e08':
MAP: Fix ANR for blocking operations on UI thread
Hemant Gupta [Wed, 23 Mar 2016 18:39:00 +0000 (18:39 +0000)]
Merge "MAP: Track ProfileState, register and unregister of BroadcastReceivers"
am:
dc85454
* commit '
dc85454495d48056ca8bb190a908d4c9889583da':
MAP: Track ProfileState, register and unregister of BroadcastReceivers
Andre Eisenbach [Wed, 23 Mar 2016 18:33:37 +0000 (18:33 +0000)]
Merge "OPP: Update share status when interrupted at remote side."
Hemant Gupta [Fri, 11 Sep 2015 11:34:52 +0000 (17:04 +0530)]
OPP: Update share status when interrupted at remote side.
Use case:
1) Select a file on DUT and send to Remote device through OPP
2) Accept the incoming file on Remote
3) While file transfer is in progress, stop the file transfer on Remote.
4) Again send the same file or different file to the same Remote Device.
Result:
OPP file transfer does not start.
Fix:
Update interrupted outbound content resolver entry when
Transfer is stopped at remote side. Otherwise DUT fails
To push OPP file after earlier OPP file is stopped on
Remote Device.
Change-Id: I9944bdd47ff9e31d0f9f8a157592e407e000e96c
Andre Eisenbach [Wed, 23 Mar 2016 18:32:21 +0000 (18:32 +0000)]
Merge "OPP: Use long instead of int"
Hemant Gupta [Thu, 10 Mar 2016 15:09:46 +0000 (20:39 +0530)]
OPP: Use long instead of int
Use long instead of int data type in OPP Java code to prevent
overflow of timestamp and filesize during transfer of large files
which caused transfer failures.
Change-Id: I58c9b49f59d47f6f162156eb6594e66731732580
Hemant Gupta [Wed, 23 Mar 2016 18:30:55 +0000 (18:30 +0000)]
Merge "MAP: CleanUp for SDP record in MAP Service shutdown"
am:
f9e3eaa
* commit '
f9e3eaa9528d75986a8e50a97c73692e4c9ba638':
MAP: CleanUp for SDP record in MAP Service shutdown
Hemant Gupta [Wed, 23 Mar 2016 18:30:55 +0000 (18:30 +0000)]
Merge "MAP: GETMessagesLisitng include mandatory field always."
am:
68277e5
* commit '
68277e56f5ba90d51e83f5b0027b97f8c9add354':
MAP: GETMessagesLisitng include mandatory field always.
Andre Eisenbach [Wed, 23 Mar 2016 18:29:42 +0000 (18:29 +0000)]
Merge "MAP: Fix ANR for blocking operations on UI thread"
Hemant Gupta [Fri, 11 Mar 2016 07:48:22 +0000 (13:18 +0530)]
MAP: Fix ANR for blocking operations on UI thread
UseCase:
Stability Testing steps followed:
1. Pair and connect with remote phone.
2. Verify successful profile connection.
3. Pair & Connect LE device.
4. Disconnect & Unpair LE device.
5. Reset BT multiple times.
6. Repeat above steps 50 times
Failure:
ANR(s) reported for long running operations perfromed on main thread.
Fix:
- Attach MAPService session handler to looper from a
worker thread to avoid long running tasks handling
for messages posted from UI thread.
- Move AppObserver Account onChange() handling
to worker thread instead of UI thread.
- Avoid running contentobserver for SMS/MMS instance on
main thread looper to fix ANR reported while handling
content changes for SMS and MMS listing. Add NPE checks
hit during stability testing.
Change-Id: Ie146cd284fd191f7c7be7f0c1e7ed4877b36ae76
Andre Eisenbach [Wed, 23 Mar 2016 18:25:44 +0000 (18:25 +0000)]
Merge "MAP: Track ProfileState, register and unregister of BroadcastReceivers"
Ashwini Munigala [Wed, 23 Mar 2016 18:23:19 +0000 (18:23 +0000)]
Merge "MAP: Cleanup PendingIntent in cancelUserTimeoutAlarm."
am:
da10fe7
* commit '
da10fe73a8f19cc4e28213bd353b412aca5680f2':
MAP: Cleanup PendingIntent in cancelUserTimeoutAlarm.
Hemant Gupta [Fri, 11 Mar 2016 07:04:25 +0000 (12:34 +0530)]
MAP: Track ProfileState, register and unregister of BroadcastReceivers
Use Case:
1. Pair and connect with remote phone.
2. Verify successful profile connection.
3. Pair & Connect LE device.
4. Disconnect & Unpair LE device.
5. Reset BT multiple times.
6. Repeat above steps 50 times
Failure:
BT Crashed, failed to start MAP services after BT reset.
RootCause:
BT Crash for not handling following exceptions:
- java.lang.IllegalArgumentException: Receiver not registered
at: android.app.IntentReceiverLeaked: Service
com.android.bluetooth.map.BluetoothMapService
has leaked IntentReceiver com.android.bluetooth.map.BluetoothMapAppObserver:
Are you missing a call to unregisterReceiver()?
Fix:
- This issue is hit when onStop() for MAPService is triggered without onStart()
being triggered by the time shutdown process gets invoked.
- Track registration and unregistration for BluetoothMapAppObserver BroadcastReceiver
to fix IntentReceiver leaks and also added validation for the AppObserver Data.
Change-Id: Ia1c2160fef369bbff42e8da3ea7d925c483e0a12
Andre Eisenbach [Wed, 23 Mar 2016 18:20:13 +0000 (18:20 +0000)]
Merge "MAP: CleanUp for SDP record in MAP Service shutdown"
Hemant Gupta [Fri, 11 Mar 2016 06:35:24 +0000 (12:05 +0530)]
MAP: CleanUp for SDP record in MAP Service shutdown
Remove SDP record per MAS Instance during MAP Service
shutdown procedure.
Add more relevant debug logging.
Change-Id: I222ad97d719b9a2c45db3ab8526dd3de9c553f3d
Andre Eisenbach [Wed, 23 Mar 2016 18:16:43 +0000 (18:16 +0000)]
Merge "MAP: GETMessagesLisitng include mandatory field always."
Ashwini Munigala [Wed, 23 Mar 2016 18:14:44 +0000 (18:14 +0000)]
Merge "MAP: Handle possible NPE while disconnect map."
am:
7cbec75
* commit '
7cbec75e7310370c6cb03cfcc48dc4ff1db951c8':
MAP: Handle possible NPE while disconnect map.
Ashwini Munigala [Wed, 23 Mar 2016 18:14:44 +0000 (18:14 +0000)]
Merge "MAP: Add MNS SDP Search during setNotificationRegistration."
am:
9556063
* commit '
9556063902bda98d28a0942509f94ea6973ebba9':
MAP: Add MNS SDP Search during setNotificationRegistration.
Hemant Gupta [Wed, 23 Mar 2016 18:14:44 +0000 (18:14 +0000)]
Merge "MAP: Declare and fetch only \'INTERESTED_MESSAGE_TYPE_CLAUSE\' MMS."
am:
5bc6229
* commit '
5bc6229907607e2857e603f4a5010851b3479b7d':
MAP: Declare and fetch only 'INTERESTED_MESSAGE_TYPE_CLAUSE' MMS.
Hemant Gupta [Fri, 11 Mar 2016 05:41:33 +0000 (11:11 +0530)]
MAP: GETMessagesLisitng include mandatory field always.
Pre condition:
Atleast one SMS is present in any of the folders
with no subject.
UseCase:
1. Connect MAP connection from MCE to DUT
2. Set folder to Telecom/msg/inbox
3. Execute MessageListing with the required data
Failure:
Mandatory field "subject" is not included for few entries
in messagesListing.
Fix:
For GETMessagesLisitng ensure blank subject string is
set to include this mandatory feild and handle possible
"null" value fetched from database.
Change-Id: Ie29a61c83b22db9008184090a2f5b17d1f34b72b
Andre Eisenbach [Wed, 23 Mar 2016 18:13:01 +0000 (18:13 +0000)]
Merge "MAP: Cleanup PendingIntent in cancelUserTimeoutAlarm."
Ashwini Munigala [Thu, 7 Jan 2016 12:30:58 +0000 (18:00 +0530)]
MAP: Cleanup PendingIntent in cancelUserTimeoutAlarm.
Handle cleanup for timeout Intent and pending Intent
in cancelUserTimeoutAlarm API.
Change-Id: I4f4184785675b2deffa3be8c9dd70b2673020b51
Hemant Gupta [Wed, 23 Mar 2016 18:06:42 +0000 (18:06 +0000)]
Merge "MAP: Synchronize notifcationReg reply and MNS connect action."
am:
075283f
* commit '
075283fe6272b77521511bf26ac2516146532cbc':
MAP: Synchronize notifcationReg reply and MNS connect action.
Hemant Gupta [Wed, 23 Mar 2016 18:06:42 +0000 (18:06 +0000)]
Merge "MAP: Synchronize mMsgList to avoid extra MessageDeleted MNS event"
am:
3b377be
* commit '
3b377bee36cd6f5427f48feaa4f921a6d902cf01':
MAP: Synchronize mMsgList to avoid extra MessageDeleted MNS event
Andre Eisenbach [Wed, 23 Mar 2016 18:06:28 +0000 (18:06 +0000)]
Merge "MAP: Handle possible NPE while disconnect map."
Ashwini Munigala [Tue, 27 Oct 2015 10:54:23 +0000 (16:24 +0530)]
MAP: Handle possible NPE while disconnect map.
Precondition:
Verified with IOT: MecApp in MCE role
UseCase:
1. Connect MAS
2. Register Mas Instance via MNS
3. Disconnect MAS
Failure:
Bluetooth App crash sometimes when disconnect map profile.
Root Cause:
The issue is hit when MAS disconnect is finished before MNS unregister.
In this case NullpointerException is happening because of clearing
BluetoothMapContentObserver already as a part of cleanup.
Fix:
Handle Null pointer exception while last
MAS instance disconnect is handled before MNS
unregistration.
Change-Id: I4e72038a5ddc6c3ac8c515def57cb4f98fe87675
Andre Eisenbach [Wed, 23 Mar 2016 18:04:17 +0000 (18:04 +0000)]
Merge "MAP: Add MNS SDP Search during setNotificationRegistration."
Ashwini Munigala [Thu, 10 Sep 2015 13:02:05 +0000 (18:32 +0530)]
MAP: Add MNS SDP Search during setNotificationRegistration.
Precondition:
Verified with remote MCE device that starts MNS server
only before issuing setNotification Registration to MSE.
Use Case:
1. Discover and Pair with MSE from MCE.
2. Connect to MSE on Mas insance 0.
3. Enable Notification Registration for MAS Instance 0
Failure:
MNS connection happens over RFCOMM
and MAS Instance is connected over L2CAP.
Root Cause:
Current design performs MNS SDP search only at the time
of successful MAS Instance Connect. MNS connect implementation
tries connection over insecure RFCOMM channel based on UUID
when MNS Server record is not available.
Fix:
Add implementation to check and perform MNS SDP search
if this info is not available when MCE requests
setNotificationRegistration. This fix is required to
handle MCE implementation that start MNS Sever and
expose SDP only before sending setNotificationRegistration.
Change-Id: If1e8d33dcac078f04d13b8bacf8e1d1513c119e1
Andre Eisenbach [Wed, 23 Mar 2016 18:02:28 +0000 (18:02 +0000)]
Merge "MAP: Declare and fetch only 'INTERESTED_MESSAGE_TYPE_CLAUSE' MMS."
Hemant Gupta [Tue, 22 Dec 2015 13:27:58 +0000 (18:57 +0530)]
MAP: Declare and fetch only 'INTERESTED_MESSAGE_TYPE_CLAUSE' MMS.
Precondition:
Messaging App Settings configured to receive delivery reports for MMS.
Use Case:
Follow standard steps to perform messagesListing type MMS from MCE.
1. Connect to MSE on Mas instance 0.
2. Set Path to root.
3. Set Path to telecom.
4. Set Path to msg.
5. Set Path to inbox.
6. GET messagesListing type MMS.
Failure:
Extra entries like delivery reports that are stored in DB and
which are not user interested types are also included
in MSE messageListing for MMS type.
Fix:
OMA-TS-MMS-ENC MMS Standard defines many types in X-Mms-Message-Type.
Extra entries like delivery reports which is stored in DB are not
required to be shown to user, so these should be filtered, and
only m-send-req (128), m-retrieve-conf (132), m-notification-ind (130)
types should be fetched and shown to user in messageListing response.
This patch removes these unecessary message types from MMS Messaging Listing.
Change-Id: I1cb5d6e58477a32a89693f555a268e0855267b9a
Andre Eisenbach [Wed, 23 Mar 2016 17:59:17 +0000 (17:59 +0000)]
Merge "MAP: Synchronize notifcationReg reply and MNS connect action."
Hemant Gupta [Mon, 21 Sep 2015 15:29:07 +0000 (20:59 +0530)]
MAP: Synchronize notifcationReg reply and MNS connect action.
Use Case:
1. Connect to carkit
2. Disconnect connection with carkit.
3. Reconnect to carkit
Failure:
MNS Failure during Reconnection.
User will in some timing conditions not get notification
of new messages and then turns OFF/ON the carkit.
MAS is connected fine but for MNS car sends BAD REQUEST.
Root Cause:
This isssue is reported only with one particular carkit in MCE role,
where in MNS Connect request issued before acknowleding
the setNotificationReg Request.
Fix:
Synchronize handleRegistration method in handler thread to ensure
setNotificationReg response from MSE is sent before requesting
a MNS Connect to MCE.
Change-Id: I30559c643af7733754fce551b97e31543a0cb160
Andre Eisenbach [Wed, 23 Mar 2016 17:57:23 +0000 (17:57 +0000)]
Merge "MAP: Synchronize mMsgList to avoid extra MessageDeleted MNS event"
Hemant Gupta [Fri, 21 Aug 2015 10:08:44 +0000 (15:38 +0530)]
MAP: Synchronize mMsgList to avoid extra MessageDeleted MNS event
Precondition:
There are no messages in Messaging App.
Use Case:
1. Connect to MSE on Mas insance 0,
Register and Enable Event Notifications from any MCE.
2. Set Path to root.
3. Set Path to telecom.
4. Set Path to msg.
5. Set Path to outbox.
6. Compose an SMS and add the recipient.
7. Click PushMessage option.
Failure:
Map Server sends a unexpected MessageDeleted EventReport Notification
even though PushMessage received from MCE is processed Successfully.
Root Cause:
Issue happens only for one corner case, where onChange() gets triggered
while processing a local initiated pushMsg before the entry is appended
to database, as local MsgListSms contains an extra entry for newly added
msg from MCE.
Fix:
Synchronize contentObserver mMsgList SMS/MMS to update list with
local initiated changes before fetching complete database list and
handling onChange() to avoid extra MessageDeleted MNS event.
Change-Id: Id4d5dad4d2b4b1e17f40218c11d13e39c9b885a0
Satish Kodishala [Wed, 23 Mar 2016 17:42:53 +0000 (17:42 +0000)]
Merge "Send error for if VR is initiated during call."
am:
a43811a
* commit '
a43811a9c6945aeb8c5ca8a15412c5913e2dad24':
Send error for if VR is initiated during call.
Andre Eisenbach [Wed, 23 Mar 2016 17:23:41 +0000 (17:23 +0000)]
Merge "Send error for if VR is initiated during call."
Satish Kodishala [Fri, 29 Jan 2016 06:39:32 +0000 (12:09 +0530)]
Send error for if VR is initiated during call.
Use case:
Connect to BT headset.
Make a call. Let the call audio be on BT headset.
Initiate voice recognition(VR) from BT headset.
Failure:
AG is not sending error for VR when initiated during call.
Headset might go into bad state if AG don't send error.
Rootcause:
AG is not sending error for VR when initiated during call.
Fix:
When VR is activated during call, send error response to headset.
Change-Id: Ib12d464fc6a6948ddf22250a65a9e5bfeb4a8fb1
Jakub Pawlowski [Wed, 23 Mar 2016 16:07:17 +0000 (16:07 +0000)]
Merge "Fix register for notification logic"
am:
39c5072
* commit '
39c50726f567c224ac9cc2244b389043e5c41234':
Fix register for notification logic
Sanket Agarwal [Wed, 23 Mar 2016 01:27:47 +0000 (18:27 -0700)]
Add Android.mk so that underneath targets can be updated.
Bug: b/
27744764
Change-Id: I88b2be8b1d362e890a0784115b83c7710e48e51b
Jakub Pawlowski [Tue, 22 Mar 2016 22:48:15 +0000 (22:48 +0000)]
Fix register for notification logic
am:
55296d1
* commit '
55296d1fb8e3daef4681205a9591f0af522b099e':
Fix register for notification logic
Jakub Pawlowski [Tue, 22 Mar 2016 22:32:55 +0000 (15:32 -0700)]
Fix register for notification logic
Bug:
27790582
Change-Id: I118071b907ec16faad401ba6583ca395d08d6d6e
Andre Eisenbach [Tue, 22 Mar 2016 22:40:33 +0000 (22:40 +0000)]
Merge "Fix register for notification logic"
Jakub Pawlowski [Tue, 22 Mar 2016 22:32:55 +0000 (15:32 -0700)]
Fix register for notification logic
Bug:
27790582
Change-Id: I118071b907ec16faad401ba6583ca395d08d6d6e
Joseph Pirozzo [Tue, 22 Mar 2016 21:07:42 +0000 (21:07 +0000)]
Merge "PBAP abort operations when disconnected" into nyc-dev
am:
d7bdccf
* commit '
d7bdccf934d5dfb7407dd024f44dbaf93b7d193b':
PBAP abort operations when disconnected
Joseph Pirozzo [Tue, 22 Mar 2016 20:57:43 +0000 (20:57 +0000)]
Merge "PBAP abort operations when disconnected" into nyc-dev
Jakub Pawlowski [Tue, 22 Mar 2016 03:57:53 +0000 (03:57 +0000)]
Use handles to identify GATT attributes (3/4)
am:
32dc7a6 -s ours
* commit '
32dc7a6b919375aede777f3c821fa316d85449ae':
Use handles to identify GATT attributes (3/4)
Jakub Pawlowski [Tue, 22 Mar 2016 03:55:14 +0000 (03:55 +0000)]
Change how services are passed up to the stack
am:
02a821a -s ours
* commit '
02a821a0df99bdef55d2282530e13541fee8d36f':
Change how services are passed up to the stack
Jakub Pawlowski [Thu, 17 Mar 2016 22:58:19 +0000 (15:58 -0700)]
Use handles to identify GATT attributes (3/4)
Bug:
27778668
Change-Id: Id6ec1229998c9fc2ecd4d0a908405a7148703bec
Jakub Pawlowski [Tue, 22 Mar 2016 03:03:19 +0000 (03:03 +0000)]
Remove unused callbacks
am:
8c33841
* commit '
8c33841d0ff37379f1090a8c72d1c7beeaefd2ac':
Remove unused callbacks
Jakub Pawlowski [Tue, 22 Mar 2016 03:03:19 +0000 (03:03 +0000)]
Get whole GATT db, instead of one by one element.
am:
aa935f9 -s ours
* commit '
aa935f98f6c200298325027705b9ea031fce3467':
Get whole GATT db, instead of one by one element.
Jakub Pawlowski [Wed, 2 Mar 2016 00:09:14 +0000 (16:09 -0800)]
Change how services are passed up to the stack
Bug:
27455533
Change-Id: I4c8218fb4c7437ab4597071ad9b580a797e34339
Jakub Pawlowski [Thu, 3 Mar 2016 23:00:46 +0000 (15:00 -0800)]
Remove unused callbacks
Bug:
27455533
Change-Id: I743b8ba7187a397f088ac720f239e368dd84a7a2
Jakub Pawlowski [Fri, 26 Feb 2016 20:01:36 +0000 (12:01 -0800)]
Get whole GATT db, instead of one by one element.
This patch uses new get_gatt_db method instead of current set of
callback to obtain GATT db.t
Bug:
27455533
Change-Id: I52e12253dd850ce8de35297c941638189cbbed1e
Jakub Pawlowski [Tue, 22 Mar 2016 02:47:18 +0000 (02:47 +0000)]
Merge "Use handles to identify GATT attributes (3/4)"
am:
65acaf4
* commit '
65acaf4cd11df55c810984184513aeb7205fb538':
Use handles to identify GATT attributes (3/4)
Andre Eisenbach [Tue, 22 Mar 2016 02:35:57 +0000 (02:35 +0000)]
Merge "Use handles to identify GATT attributes (3/4)"
Jakub Pawlowski [Thu, 17 Mar 2016 22:58:19 +0000 (15:58 -0700)]
Use handles to identify GATT attributes (3/4)
Bug:
27778668
Change-Id: Id6ec1229998c9fc2ecd4d0a908405a7148703bec
Andre Eisenbach [Tue, 22 Mar 2016 01:17:38 +0000 (01:17 +0000)]
Merge changes I38c8ec64,Iac544226
am:
a72735c
* commit '
a72735cdea8b2cfe15bd03826d4881dedda8004c':
Make sure wakelock is held before releaseing it
Do not delete/re-create wakelock on acquisition/release
Andre Eisenbach [Tue, 22 Mar 2016 01:04:45 +0000 (01:04 +0000)]
Merge changes I38c8ec64,Iac544226
* changes:
Make sure wakelock is held before releaseing it
Do not delete/re-create wakelock on acquisition/release
Andre Eisenbach [Mon, 21 Mar 2016 17:15:30 +0000 (10:15 -0700)]
Make sure wakelock is held before releaseing it
Bug:
27748109
Change-Id: I38c8ec640f5def7c53348d2dd96a0a2492ff00cc
Andre Eisenbach [Thu, 17 Mar 2016 23:49:59 +0000 (16:49 -0700)]
Do not delete/re-create wakelock on acquisition/release
Also provide additional status for wakelock acquisition/release errors.
Bug:
27721443
Change-Id: Iac544226fed4a73a50bd954e74d96edd4bed93d2
Joseph Pirozzo [Mon, 21 Mar 2016 21:23:06 +0000 (14:23 -0700)]
PBAP abort operations when disconnected
Push long running activities relating to the contacts database onto its
own thread such that the main service thread can remain responsive to
new bluetooth requests.
Bug:
27697738
Change-Id: I0202962a49d6a0279b5672152955840dd02bdf31
Sanket Agarwal [Mon, 21 Mar 2016 23:42:00 +0000 (23:42 +0000)]
Forward in iPhone leads to play state being presisted as STOP.
am:
26469ff
* commit '
26469ff3f9f4ab96ad288e0934220023a0c159f1':
Forward in iPhone leads to play state being presisted as STOP.
Sanket Agarwal [Mon, 21 Mar 2016 21:00:30 +0000 (14:00 -0700)]
Forward in iPhone leads to play state being presisted as STOP.
When we press forward in iPhone (via AVRCP pass through or iPhone UI)
while connected over AVRCP we are resetting the state and expecting
AVRCP to give us a new play state when next song resumes. Turns out that
iPhone always keeps it state to be Playing.
The fix is to keep the mRemoteMediaPlayers a replica of what AVRCP says
so that when song resumes (from A2dpSinkService via startAvrcpUpdates)
we can restore the playing state.
Tested on iPhone and regression tested on Nexus 5X.
Bug: b/
27768620
Change-Id: I8caf56072fa5743f28e1680860c161d3cd75b83c
Andre Eisenbach [Mon, 21 Mar 2016 18:44:39 +0000 (18:44 +0000)]
Make sure wakelock is held before releaseing it
am:
e94f8eb
* commit '
e94f8eb85b68b351319499337af937835730b508':
Make sure wakelock is held before releaseing it
Andre Eisenbach [Mon, 21 Mar 2016 17:15:30 +0000 (10:15 -0700)]
Make sure wakelock is held before releaseing it
Bug:
27748109
Change-Id: I38c8ec640f5def7c53348d2dd96a0a2492ff00cc
Ajay Panicker [Mon, 21 Mar 2016 16:28:51 +0000 (16:28 +0000)]
Merge "Add scan results to scan stats"
am:
7296f05
* commit '
7296f0530c435e88df31d08519705a0517943b5a':
Add scan results to scan stats
Ajay Panicker [Mon, 21 Mar 2016 16:21:28 +0000 (16:21 +0000)]
Merge "Add scan results to scan stats"
Ajay Panicker [Wed, 9 Mar 2016 03:54:18 +0000 (19:54 -0800)]
Add scan results to scan stats
Ex:
GATT Client Map
Entries: 1
no.nordicsemi.android.mcp
LE scans (started/stopped) : 3 / 3
Scan time in ms (min/max/avg/total): 3050 / 6901 / 4815 / 14447
Total number of results : 338
Last 3 scans :
1970/01/01 08:20:06 - 6901ms 0 results
1970/01/01 08:20:13 - 4496ms 171 results
1970/01/01 08:20:39 - 3050ms 167 results
Bug:
27294154
Change-Id: I32fd6da035f2c37302a105733ac6a9817547b7a3