OSDN Git Service
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
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
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
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: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
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
Andre Eisenbach [Fri, 18 Mar 2016 22:11:51 +0000 (22:11 +0000)]
Merge "Change how services are passed up to the stack"
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
Ajay Panicker [Mon, 14 Mar 2016 20:47:49 +0000 (20:47 +0000)]
Merge "Print bluetooth state as a string"
Ajay Panicker [Mon, 14 Mar 2016 19:56:20 +0000 (12:56 -0700)]
Print bluetooth state as a string
Bug:
27294154
Change-Id: I992f720d94be1f0762424ebad36ec1b6af58600b
Ajay Panicker [Wed, 9 Mar 2016 18:41:33 +0000 (18:41 +0000)]
Merge "Add enabled time to dump output"
Ajay Panicker [Wed, 9 Mar 2016 01:38:25 +0000 (17:38 -0800)]
Add enabled time to dump output
Ex:
Bluetooth Status
enabled: true
state: 12
address: F8:CF:C5:CE:F5:69
name: AOSP on Shamu
time since enabled: 00:00:32.999
Bug:
27294154
Change-Id: Ie65964411e2095434a082f3d988133190c1f2f59
Ajay Panicker [Wed, 9 Mar 2016 00:36:15 +0000 (00:36 +0000)]
Merge "Move ScanStats to its own file"
Ajay Panicker [Wed, 2 Mar 2016 03:59:51 +0000 (19:59 -0800)]
Move ScanStats to its own file
ScanStats was growing too large and had many components so
it was moved into its own file.
Bug:
27294154
Change-Id: Ic20c9e74d5d8b074f7e966625fb1bffab6c94f2d
Franck Lenormand [Mon, 7 Mar 2016 21:01:15 +0000 (21:01 +0000)]
Merge "Prevent javacrash when TELEPHONY_SERVICE is not found"
am:
8367ebbea6
* commit '
8367ebbea6f2298736457345cefe28882ef2e60a':
Prevent javacrash when TELEPHONY_SERVICE is not found
Andre Eisenbach [Mon, 7 Mar 2016 20:57:17 +0000 (20:57 +0000)]
Merge "Prevent javacrash when TELEPHONY_SERVICE is not found"
Franck Lenormand [Wed, 8 Apr 2015 13:21:36 +0000 (15:21 +0200)]
Prevent javacrash when TELEPHONY_SERVICE is not found
The API context.getSystemService can return NULL
A Javacrash can happend when trying to obtain the TELEPHONY_SERVICE
and getting null instead.
The patch warn about the value of the instance of the service returned.
It also log and prevent its use in function startListenForPhoneState and
stopListenForPhoneState.
If the TELEPHONY_SERVICE is not available, the internal variables wont
change.
Change-Id: I9e4abc88a58f7f037bbc4f3f7c1cf1b44328ce38
Signed-off-by: franck Lenormand <franckx.lenormand@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
Hemant Gupta [Fri, 4 Mar 2016 17:18:19 +0000 (17:18 +0000)]
Merge "MAP: Support messageListing PARAMETER_MASK_ALL_ENABLED by default."
am:
6dfb1505ad
* commit '
6dfb1505ade8b7543f1ffaaf28d80f4bcac45ab8':
MAP: Support messageListing PARAMETER_MASK_ALL_ENABLED by default.
Andre Eisenbach [Fri, 4 Mar 2016 17:11:06 +0000 (17:11 +0000)]
Merge "MAP: Support messageListing PARAMETER_MASK_ALL_ENABLED by default."
Hemant Gupta [Tue, 22 Dec 2015 11:32:16 +0000 (17:02 +0530)]
MAP: Support messageListing PARAMETER_MASK_ALL_ENABLED by default.
Support application parameter mask to enable and send across
all optional and mandatory feilds in GET messagesListing response
instead of only mandatory feilds to handle IOT Specific behavior
that donot include parameter mask attribute in messageListing request.
Some carkits in MCE role show read messages as unread when
"read" feild (optional) is not included in messagesListing
response by default.
Change-Id: I1fc65d85c35573e21d0c9d5bfdefd58de2dcf3ae
Nitin Shivpure [Fri, 4 Mar 2016 16:48:22 +0000 (16:48 +0000)]
Merge "Bluetooth: Fix to avoid PAN JNI crash due to ENABLE_TIMEOUT"
am:
954f845ccc
* commit '
954f845cccb897b47fc22753ffca3da3748ff8ed':
Bluetooth: Fix to avoid PAN JNI crash due to ENABLE_TIMEOUT
Andre Eisenbach [Fri, 4 Mar 2016 16:42:48 +0000 (16:42 +0000)]
Merge "Bluetooth: Fix to avoid PAN JNI crash due to ENABLE_TIMEOUT"
Nitin Shivpure [Tue, 13 Oct 2015 09:49:08 +0000 (15:19 +0530)]
Bluetooth: Fix to avoid PAN JNI crash due to ENABLE_TIMEOUT
A case, where BT ON/OFF is running in the loop(stress). In one
of the iteration, BT ON gets failed due to ENABLE_TIMEOUT.
But BTIF for PAN had already been initialized. SSR cleanup is
triggered due to BT on failure. So PAN JNI callback obj gets deleted,
PAN control_state_callback is triggered just after PAN JNI cleanup.
BT gets crashed. Checking for NULL to avoid crash in any unknown
scenario.
Change-Id: Ie95470348f11be6c9eccc1e4ac3869d6789f3f6c
Jakub Pawlowski [Thu, 3 Mar 2016 23:51:31 +0000 (23:51 +0000)]
Merge "Remove unused callbacks"
am:
975faa165d
* commit '
975faa165d52a87faa00b56d06fccd9b2a0da865':
Remove unused callbacks
Andre Eisenbach [Thu, 3 Mar 2016 23:49:25 +0000 (23:49 +0000)]
Merge "Remove unused callbacks"
Jakub Pawlowski [Thu, 3 Mar 2016 23:00:46 +0000 (15:00 -0800)]
Remove unused callbacks
Bug:
27455533
Change-Id: I743b8ba7187a397f088ac720f239e368dd84a7a2
AnubhavGupta [Thu, 3 Mar 2016 23:47:43 +0000 (23:47 +0000)]
Merge "Stop accessing statemachine after cleanup"
am:
0ef82f788d
* commit '
0ef82f788d6362b21a06792d3189a7a57ff9be38':
Stop accessing statemachine after cleanup
Ajay Panicker [Thu, 3 Mar 2016 23:44:31 +0000 (23:44 +0000)]
Merge "Stop accessing statemachine after cleanup"
AnubhavGupta [Tue, 15 Sep 2015 09:13:10 +0000 (14:43 +0530)]
Stop accessing statemachine after cleanup
Usecase:
-pair and connect DUT with Remote
-Start A2DP streaming
-Initiate disconnection from DUT
Failure:
Bluetoth crashed after initiating disconnect from DUT
Rootcause:
Accessing state machine context after cleanup.
Fix:
Bluetooth: Added null check to stop accessing state machine after cleanup
Change-Id: I85ca55aaa0b7604125e45a62e32ae02eca605e43
Jakub Pawlowski [Thu, 3 Mar 2016 23:01:39 +0000 (23:01 +0000)]
Merge "Get whole GATT db, instead of one by one element."
am:
34ab8dd613
* commit '
34ab8dd6136e674715d2732d0b610cb36008a720':
Get whole GATT db, instead of one by one element.
Andre Eisenbach [Thu, 3 Mar 2016 22:52:44 +0000 (22:52 +0000)]
Merge "Get whole GATT db, instead of one by one element."
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
Satish Kodishala [Thu, 3 Mar 2016 18:38:26 +0000 (18:38 +0000)]
Merge "Proper handling of BTRH command in HFP client"
am:
e8915edfdc
* commit '
e8915edfdc2d0c28d1dec94ae848566f6f7de471':
Proper handling of BTRH command in HFP client
Ajay Panicker [Thu, 3 Mar 2016 18:28:38 +0000 (18:28 +0000)]
Merge "Proper handling of BTRH command in HFP client"
Satish Kodishala [Thu, 11 Feb 2016 07:50:50 +0000 (13:20 +0530)]
Proper handling of BTRH command in HFP client
Usecase:
1. Enable hf client role and connect to AG.
2. Run PTS test case RHH/BV-04.
Failure:
PTS test case fails since the test expects the call to be active.
Rootcause:
Hf client is not sending AT+BTRH for accepting held call
Fix:
Remove unnecessary check against of action policy flag while
executing BTRH command
Change-Id: Iebd5e02f3bf70cc39288219340cd47ebad3d8349
Ajay Panicker [Wed, 2 Mar 2016 00:56:28 +0000 (00:56 +0000)]
Merge "Add more statistics to scan logs"
am:
939ea0884b
* commit '
939ea0884bbfddba164b43ab5e2340a015448d02':
Add more statistics to scan logs
Ajay Panicker [Wed, 2 Mar 2016 00:56:22 +0000 (00:56 +0000)]
Merge "Fix warnings in packages/apps/Bluetooth"
am:
53dd65a5dd
* commit '
53dd65a5dd14f6133103daab3d8a0ca6b35329d5':
Fix warnings in packages/apps/Bluetooth
Ajay Panicker [Wed, 2 Mar 2016 00:55:53 +0000 (00:55 +0000)]
Merge "Add more statistics to scan logs"
Ajay Panicker [Tue, 1 Mar 2016 21:46:00 +0000 (13:46 -0800)]
Add more statistics to scan logs
Added length of connection time to connections. Also added scan type
(opportunistic/background) to last X scans.
Example of new print:
GATT Client Map
Entries: 2
no.nordicsemi.android.mcp (Registered)
LE scans (started/stopped) : 2 / 2
Scan time in ms (min/max/avg/total): 1604 / 7274 / 4439 / 8878
Last 2 scans :
1970/02/19 21:30:20 - 1604ms
1970/02/19 23:59:00 - 7274ms
Application ID : 6
UUID :
0c452531-a57e-44df-9ac6-
e2b780d2f715
Connections: 1
6: FF:08:11:53:44:A1 10008ms
com.example.apanicke.bletest (Registered)
LE scans (started/stopped) : 2 / 2
Scan time in ms (min/max/avg/total): 2946 / 9996 / 6471 / 12942
Last 2 scans :
1970/02/19 21:30:07 - 2946ms Opp
1970/02/19 21:30:17 - 9996ms Opp
Application ID : 5
UUID :
f25c1bdf-559f-43a6-8348-
40ca92975b33
Connections: 0
Bug:
27294154
Change-Id: I7460fb1568f20a1ce13b01d101517852cf9aec4a
Ajay Panicker [Wed, 2 Mar 2016 00:46:21 +0000 (00:46 +0000)]
Merge "Fix warnings in packages/apps/Bluetooth"
Ajay Panicker [Tue, 1 Mar 2016 22:14:56 +0000 (14:14 -0800)]
Fix warnings in packages/apps/Bluetooth
Bug:
27301103
Change-Id: I2f2698a2fb3f7ca7031a803e43a398f59bd32cdb
Ajay Panicker [Tue, 1 Mar 2016 18:03:09 +0000 (18:03 +0000)]
Merge "Protect ScanStats from race conditions"
am:
3e1e2f6e9e
* commit '
3e1e2f6e9ecd3604c63e96ca535a10bebf87d6e2':
Protect ScanStats from race conditions
Ajay Panicker [Tue, 1 Mar 2016 17:59:55 +0000 (17:59 +0000)]
Merge "Protect ScanStats from race conditions"
Ajay Panicker [Mon, 29 Feb 2016 18:37:33 +0000 (10:37 -0800)]
Protect ScanStats from race conditions
Bug:
27294154
Change-Id: Icc0b0a6cfb93fca4a9a2aee49b94c0be1d62527f
Baligh Uddin [Sat, 27 Feb 2016 16:12:02 +0000 (16:12 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Sat, 27 Feb 2016 08:13:48 +0000 (00:13 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
27293916
Change-Id: Ie02519e03cdb8bead5cfca8e424de0184482580d
Ajay Panicker [Sat, 27 Feb 2016 01:20:25 +0000 (01:20 +0000)]
Merge "Fix logic for repeated record scan calls"
am:
3f5e211e2b
* commit '
3f5e211e2bb4320db5a9f8af3fb29623983ff72e':
Fix logic for repeated record scan calls
Ajay Panicker [Sat, 27 Feb 2016 01:17:31 +0000 (01:17 +0000)]
Merge "Fix logic for repeated record scan calls"
Ajay Panicker [Sat, 27 Feb 2016 00:03:10 +0000 (16:03 -0800)]
Fix logic for repeated record scan calls
If recordStartScan or recordStopScan is called multiple times,
there are issues where logged values are incorrect.
Bug:
27294154
Change-Id: Ie049e917ae26fec4c50874ed703e404146c15044
Ajay Panicker [Fri, 26 Feb 2016 23:49:00 +0000 (23:49 +0000)]
Merge "Mark background and opportunistic scans in scan statistics"
am:
fcdb8bd4a3
* commit '
fcdb8bd4a3aebeecb89bd733dd678263e45e892b':
Mark background and opportunistic scans in scan statistics
Ajay Panicker [Fri, 26 Feb 2016 23:46:31 +0000 (23:46 +0000)]
Merge "Mark background and opportunistic scans in scan statistics"
Ajay Panicker [Wed, 24 Feb 2016 23:43:53 +0000 (15:43 -0800)]
Mark background and opportunistic scans in scan statistics
Bug:
27294154
Change-Id: I71d8f388aa83da581958d2169ca9a5eb6088a367
Pavlin Radoslavov [Fri, 26 Feb 2016 04:22:22 +0000 (04:22 +0000)]
Merge "Fix the argument processing when dumping Bluetooth state"
am:
ac9407b0c3
* commit '
ac9407b0c3657b945d4371bc1e827a8dd5958720':
Fix the argument processing when dumping Bluetooth state
Pavlin Radoslavov [Fri, 26 Feb 2016 04:18:37 +0000 (04:18 +0000)]
Merge "Fix the argument processing when dumping Bluetooth state"
Pavlin Radoslavov [Fri, 26 Feb 2016 04:03:09 +0000 (20:03 -0800)]
Fix the argument processing when dumping Bluetooth state
Apparently, when dump() is invoked via bugreport for
Bluetooth's AdapterServe, the optional arguments contain "-a".
The existing logic for checking the arguments for "--proto"
and return the result in Protobuf format failed to detect that,
and suppressed any output.
Now any unrecognized options are ignored, and the default
(text) output is returned.
Bug:
27293885
Change-Id: I0f0d94507ebf6fed7628d49cd1de2a1b2801e6ad
Baligh Uddin [Thu, 25 Feb 2016 16:40:17 +0000 (16:40 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Pavlin Radoslavov [Thu, 25 Feb 2016 00:13:06 +0000 (00:13 +0000)]
Merge "Add a missing null pointer check for AdapterService"
am:
2871b49c82
* commit '
2871b49c827a9cb994e4ba82af5a20a026cf8f71':
Add a missing null pointer check for AdapterService
Pavlin Radoslavov [Thu, 25 Feb 2016 00:02:17 +0000 (00:02 +0000)]
Merge "Add a missing null pointer check for AdapterService"
Pavlin Radoslavov [Wed, 24 Feb 2016 22:53:22 +0000 (14:53 -0800)]
Add a missing null pointer check for AdapterService
Add a missing null pointer check for AdapterService
inside class AdapterServiceBinder when receiving
a Binder request to dump Bluetooth state.
Bug:
27343461
Change-Id: I62e67120f6eb6edb5a93b19a9cca5c09862d6506
Ajay Panicker [Wed, 24 Feb 2016 21:38:13 +0000 (21:38 +0000)]
Merge "Add timestamp to last scans"
am:
781af1e9b1
* commit '
781af1e9b11912f706a7ca00f8b20427fbfe996a':
Add timestamp to last scans
Ajay Panicker [Wed, 24 Feb 2016 19:32:38 +0000 (19:32 +0000)]
Merge "Add timestamp to last scans"
Ajay Panicker [Wed, 24 Feb 2016 00:49:54 +0000 (16:49 -0800)]
Add timestamp to last scans
Ex:
no.nordicsemi.android.mcp (Registered)
LE scans (started/stopped) : 5 / 4
Scan time in ms (min/max/avg) : 97 / 1476 / 897
Last 4 scans (timestamp - duration):
1970/02/13 21:10:19 - 1476ms
1970/02/13 21:10:21 - 97ms
1970/02/13 21:10:23 - 929ms
1970/02/13 21:10:25 - 531ms
Application ID : 5
UUID :
f77437a1-5e86-4e2d-8223-
6193a095c7f5
Current scan duration in ms : 1452
Connections: 0
Bug:
27294154
Change-Id: I66ba6b4bc2d45ced7d6414db007394a16a30956e
Baligh Uddin [Tue, 23 Feb 2016 23:16:50 +0000 (15:16 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
27293916
Change-Id: I7a6f09c5a34f78bbbbfaa472ab041f55e3015561
Aurimas Liutikas [Tue, 23 Feb 2016 21:59:12 +0000 (21:59 +0000)]
Merge "Fix warnings in packages/apps/Bluetooth"
am:
d34003325c
* commit '
d34003325c6f2b1618a0356e81f8e9644593c2b8':
Fix warnings in packages/apps/Bluetooth
Aurimas Liutikas [Tue, 23 Feb 2016 21:51:03 +0000 (21:51 +0000)]
Merge "Fix warnings in packages/apps/Bluetooth"
Aurimas Liutikas [Tue, 23 Feb 2016 00:39:38 +0000 (16:39 -0800)]
Fix warnings in packages/apps/Bluetooth
Bug:
27301103
Change-Id: I5eec4610f64af4191f64e946122623b6fe222b92
Ajay Panicker [Sat, 20 Feb 2016 01:18:33 +0000 (01:18 +0000)]
Merge "Clean up gatt dump output"
am:
afdc8ec399
* commit '
afdc8ec399bc0d4ab118a83e3cacec41263e2d15':
Clean up gatt dump output
Ajay Panicker [Sat, 20 Feb 2016 00:52:42 +0000 (00:52 +0000)]
Merge "Clean up gatt dump output"
Ajay Panicker [Fri, 19 Feb 2016 00:43:26 +0000 (16:43 -0800)]
Clean up gatt dump output
Change-Id: Ia411bb3446b657b06a1748daa14628da79d59ca0
Andre Eisenbach [Thu, 18 Feb 2016 06:37:00 +0000 (06:37 +0000)]
Merge "Output the Protobuf result in Base64 string"
am:
f481ad9463
* commit '
f481ad94638e3db693a6ada090afec659cd2ec7c':
Output the Protobuf result in Base64 string
Andre Eisenbach [Thu, 18 Feb 2016 06:34:41 +0000 (06:34 +0000)]
Merge "Output the Protobuf result in Base64 string"
Pavlin Radoslavov [Thu, 18 Feb 2016 03:01:42 +0000 (19:01 -0800)]
Output the Protobuf result in Base64 string
Outputing in binary format does not work, because
the reader assumes the output is a string.
Change-Id: If24797264e82c649c21f9b984f04ec70adbcec94
Pavlin Radoslavov [Thu, 18 Feb 2016 02:06:45 +0000 (02:06 +0000)]
Merge "Add Java Protobuf dump and ScanEvent Protobuf"
am:
03a1b4fc09
* commit '
03a1b4fc094ab32ccf0c48d299c3cee1348bab3f':
Add Java Protobuf dump and ScanEvent Protobuf
Pavlin Radoslavov [Thu, 18 Feb 2016 01:48:55 +0000 (01:48 +0000)]
Merge "Add Java Protobuf dump and ScanEvent Protobuf"
Ajay Panicker [Tue, 16 Feb 2016 18:38:53 +0000 (10:38 -0800)]
Add Java Protobuf dump and ScanEvent Protobuf
Add Protobuf dumping for the Java layer. Also add ScanEvent Protobuf
to already existing scan event logging.
Change-Id: Ib05973c8d98df3bead84b22b3773c42effb25c87
Andre Eisenbach [Thu, 18 Feb 2016 00:27:24 +0000 (00:27 +0000)]
Merge "Improve BT OPP throughput"
am:
ceba109434
* commit '
ceba109434fca8bf56b051edd888244adf54687d':
Improve BT OPP throughput
Andre Eisenbach [Thu, 18 Feb 2016 00:20:56 +0000 (00:20 +0000)]
Merge "Improve BT OPP throughput"
Deepak A Metri [Fri, 9 Oct 2015 10:42:21 +0000 (12:42 +0200)]
Improve BT OPP throughput
Progress Bar updation during OPP takes around 40ms for each update.
This causes a significant delay in OPP file transfer, which eventually
will decrease the throughput.
To improve the throughput, invoke the progressBar updation only if there
is a change in the percentage.
Change-Id: I64a0b47093698959026d2b97f296c709a7d92703
Signed-off-by: Deepak A Metri <deepak.a.metri@intel.com>
Signed-off-by: Cedric Bondier <cedric.bondier@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
Bill Yi [Wed, 17 Feb 2016 17:50:54 +0000 (09:50 -0800)]
Andre Eisenbach [Tue, 16 Feb 2016 19:05:39 +0000 (19:05 +0000)]
Merge "HFP: Do not return NULL when the HDP interface is unavailable"
Arnav Gupta [Wed, 10 Feb 2016 00:27:49 +0000 (05:57 +0530)]
HFP: Do not return NULL when the HDP interface is unavailable
We're not supposed to return a NULL from a a function returning an int
value. And indeed the calling Java code does not have a NPE check either.
If an HDP interface is not avaialable, send -1 which the Java code
correctly assumes as a failure to register the health app.
Change-Id: I5ac7dc6f9acc9fefae8d1d2233453448c3ba79bc
Signed-off-by: Arnav Gupta <championswimmer@gmail.com>
Andre Eisenbach [Thu, 11 Feb 2016 20:15:39 +0000 (20:15 +0000)]
Merge "Fix NPE crash while removeBatch"
jun.x.wang [Thu, 14 Aug 2014 05:36:59 +0000 (13:36 +0800)]
Fix NPE crash while removeBatch
When unpairing two devices, the BluetoothOppShareInfo
in BluetoothOppBatch may be null during transfer.
Change-Id: I7b4fbd0f291250deebdeaea4bf2d2f540fe233dc
Marie Janssen [Wed, 10 Feb 2016 23:32:31 +0000 (23:32 +0000)]
Merge "Alternate dumpsys output for arguments"
Marie Janssen [Mon, 1 Feb 2016 19:04:08 +0000 (11:04 -0800)]
Alternate dumpsys output for arguments
The metrics collection uses the dumpsys function with extra arguments to
provide different formatted output.
When arguments are provided, skip the normal output and use
alternatives.
Change-Id: Ie43b9134c4b21bb2761228934b954e68f2360c2f