OSDN Git Service

android-x86/packages-apps-Bluetooth.git
7 years agoPrevent SQL query from having a bad where clause
Ajay Panicker [Thu, 15 Dec 2016 02:43:07 +0000 (18:43 -0800)]
Prevent SQL query from having a bad where clause

Bug: 33092708
Test: Sanity test MAP on carkit
Change-Id: I6c7f54f60877cf2c57df9b3521604660321214ff

7 years agoMerge "Prevent Null Pointer Exception caused by empty remote device properties"
Treehugger Robot [Thu, 15 Dec 2016 05:54:12 +0000 (05:54 +0000)]
Merge "Prevent Null Pointer Exception caused by empty remote device properties"

7 years agoPrevent Null Pointer Exception caused by empty remote device properties
Ajay Panicker [Thu, 15 Dec 2016 01:50:01 +0000 (17:50 -0800)]
Prevent Null Pointer Exception caused by empty remote device properties

Bug: 33092708
Test: runtest bluetooth
Change-Id: I6d7bfd9baaa428692183a64cc7ae87438862d518

7 years agoMerge "Fix BT stack crashing on GATT discovery"
Andre Eisenbach [Wed, 14 Dec 2016 23:23:49 +0000 (23:23 +0000)]
Merge "Fix BT stack crashing on GATT discovery"

7 years agoFix BT stack crashing on GATT discovery
Jakub Pawlowski [Wed, 14 Dec 2016 22:52:52 +0000 (14:52 -0800)]
Fix BT stack crashing on GATT discovery

Bug: 33577836
Test: manual test
Change-Id: I3b00490cb087b6da709332c30c2e50cba9d5e1a8

7 years agoMerge "Remove disk IO read/write blocks in AdapterService for main thread"
Treehugger Robot [Wed, 14 Dec 2016 00:14:31 +0000 (00:14 +0000)]
Merge "Remove disk IO read/write blocks in AdapterService for main thread"

7 years agoRemove disk IO read/write blocks in AdapterService for main thread
Jack He [Wed, 7 Dec 2016 00:09:09 +0000 (16:09 -0800)]
Remove disk IO read/write blocks in AdapterService for main thread

* Call getSharedPreferences() asynchronously during onCreate() to cache
  preferences in memory as early as possible to prevent ANR
* Change editor.commit() to editor.apply() in AdapterService for:
setPhonebookAccessPermission
setMessageAccessPermission
setSimAccessPermission
  so that these methods will return true when editor.apply() is called.
  After that call, the preference will be updated in memory so that
  following calls that use such preferences will see the change.
  However, there is a possibility that write to persistent storage will
  fail in the background which reset the preference after reboot or service
  restart. In this case, we need to call these method again.
* Same changes in Avrcp for:
blackListCurrentDevice
resetBlackList
  In these methods, the return values for editor.commit() are already
  ignored and therefore no user-visible effect.

Bug: 33382877
Test: mannual test, connect to carkit and browse phone book
Change-Id: I605dc00db4647f06c9fa797f272188a44f0e5724

7 years agoMerge "Replace usage of "vector<>" with "std::vector<>""
Treehugger Robot [Tue, 13 Dec 2016 23:36:41 +0000 (23:36 +0000)]
Merge "Replace usage of "vector<>" with "std::vector<>""

7 years agoReplace usage of "vector<>" with "std::vector<>"
Pavlin Radoslavov [Sat, 10 Dec 2016 01:43:13 +0000 (17:43 -0800)]
Replace usage of "vector<>" with "std::vector<>"

This change is needed so we can remove the last instances
of "using std::vector" statements in hardware/libhardware.

Test: code compilation

Change-Id: I5963f7c5768d67dbd92c526f41ec1c291c353aad

7 years agoMerge "Update clang-format for correct Java style."
Treehugger Robot [Mon, 12 Dec 2016 21:22:23 +0000 (21:22 +0000)]
Merge "Update clang-format for correct Java style."

7 years agoUpdate clang-format for correct Java style.
Marie Janssen [Mon, 12 Dec 2016 18:06:13 +0000 (10:06 -0800)]
Update clang-format for correct Java style.

Move clang-format so it applies to the whole tree, and update for Java
style that is compatible with style with existing AOSP style.

Test: clang-format -style=file
Change-Id: I8cf854cc290669f9efefc34dcaddc43075978dfb

7 years agoMerge "AVRCP: Catch Intent.startService SecurityException"
Treehugger Robot [Mon, 12 Dec 2016 20:08:44 +0000 (20:08 +0000)]
Merge "AVRCP: Catch Intent.startService SecurityException"

7 years agoAVRCP: Catch Intent.startService SecurityException
Marie Janssen [Wed, 23 Nov 2016 23:42:56 +0000 (15:42 -0800)]
AVRCP: Catch Intent.startService SecurityException

If a package is being upgraded it is frozen and we can't start the
MediaBrowseService on it.

Test: runtest bluetooth

Bug: 32977865
Change-Id: Ie0c47f6db370be70259c5e7cde67b2e89c07ab75

7 years agoMerge "Use the correct ContextMap for scan statistics"
Treehugger Robot [Wed, 7 Dec 2016 23:56:48 +0000 (23:56 +0000)]
Merge "Use the correct ContextMap for scan statistics"

7 years agoUse the correct ContextMap for scan statistics
Ajay Panicker [Wed, 7 Dec 2016 21:52:35 +0000 (13:52 -0800)]
Use the correct ContextMap for scan statistics

Test: "adb shell dumpsys bluetooth_manager" after scanning with an LE app
Change-Id: Id8c16aa171d9ceee9b3ce83ae5afbefa0d6fd9ed

7 years agoMerge "JNI: clang-format code"
Marie Janssen [Tue, 6 Dec 2016 20:05:53 +0000 (20:05 +0000)]
Merge "JNI: clang-format code"
am: 55ddf34f21

Change-Id: I93307eadeb1b25cb191923ae52af4fb6580e5469

7 years agoMerge "JNI: clang-format code"
Treehugger Robot [Tue, 6 Dec 2016 19:59:15 +0000 (19:59 +0000)]
Merge "JNI: clang-format code"

7 years agoJNI: clang-format code
Marie Janssen [Tue, 6 Dec 2016 17:57:09 +0000 (09:57 -0800)]
JNI: clang-format code

Add clang-format file.
Add PREUPLOAD to check newly uploaded code.

clang-format --style=file jni/*.cpp

Test: mma -j37
Change-Id: I76bc67f7e69ac374f82d6c5d9745657f31dccdae

7 years agoMerge "AdapterService: enforce new user restriction for disallowing Bluetooth."
ltrochtova [Tue, 6 Dec 2016 11:55:04 +0000 (11:55 +0000)]
Merge "AdapterService: enforce new user restriction for disallowing Bluetooth."
am: 80343eba78

Change-Id: I26a9af5750833ba8d9202c3b9159ad9ffa060bc2

7 years agoMerge "AdapterService: enforce new user restriction for disallowing Bluetooth."
ltrochtova [Tue, 6 Dec 2016 11:47:40 +0000 (11:47 +0000)]
Merge "AdapterService: enforce new user restriction for disallowing Bluetooth."

7 years agoAdapterService: enforce new user restriction for disallowing Bluetooth.
Lenka Trochtova [Fri, 2 Dec 2016 11:46:22 +0000 (12:46 +0100)]
AdapterService: enforce new user restriction for disallowing Bluetooth.

Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.UserRestrictionsTest
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction

Bug: 32895300

Change-Id: I832b9c7d6427dfd977a6f0ee73c860234c1e2347

7 years agoMerge "JNI: style cleanup"
Marie Janssen [Mon, 5 Dec 2016 23:03:49 +0000 (23:03 +0000)]
Merge "JNI: style cleanup"
am: f506b2126d

Change-Id: I3e2d7818fae0fe7d7b67f68d0c5c5cff0e826c29

7 years agoMerge "JNI: style cleanup"
Marie Janssen [Mon, 5 Dec 2016 22:59:03 +0000 (22:59 +0000)]
Merge "JNI: style cleanup"

7 years agoJNI: style cleanup
Marie Janssen [Wed, 30 Nov 2016 19:20:25 +0000 (11:20 -0800)]
JNI: style cleanup

Beginning of style cleanup:
 - no assigns in conditionals
 - move declarations closer to first use
 - replace __FUNCTION__ with __func__
 - remove unnecessary gotos

Test: mma && manual sanity tests

Change-Id: I7f8fca01dd57f57538b71fe7d7753fffe1de4d00

7 years agoMerge "Revert "AdapterService: enforce new user restriction for disallowing Bluetooth.""
ltrochtova [Thu, 1 Dec 2016 21:48:13 +0000 (21:48 +0000)]
Merge "Revert "AdapterService: enforce new user restriction for disallowing Bluetooth.""
am: 490b7a3bbe

Change-Id: I8cb18c89f011e1117876ef4d044ad30e744e2f57

7 years agoMerge "Fix null settings in AdvertiseCallback.onStartSuccess"
Jakub Pawlowski [Thu, 1 Dec 2016 21:37:36 +0000 (21:37 +0000)]
Merge "Fix null settings in AdvertiseCallback.onStartSuccess"
am: 67969eff13

Change-Id: I1368389902709d0a9b6745f8c88d2f154db772dc

7 years agoMerge "AdapterService: enforce new user restriction for disallowing Bluetooth."
ltrochtova [Thu, 1 Dec 2016 21:31:47 +0000 (21:31 +0000)]
Merge "AdapterService: enforce new user restriction for disallowing Bluetooth."
am: 6add0e7b31

Change-Id: I2651d74350dea46faed29a82847634b035e9a15a

7 years agoMerge "Revert "AdapterService: enforce new user restriction for disallowing Bluetooth.""
ltrochtova [Thu, 1 Dec 2016 21:20:42 +0000 (21:20 +0000)]
Merge "Revert "AdapterService: enforce new user restriction for disallowing Bluetooth.""

7 years agoMerge "Fix null settings in AdvertiseCallback.onStartSuccess"
Treehugger Robot [Thu, 1 Dec 2016 21:10:59 +0000 (21:10 +0000)]
Merge "Fix null settings in AdvertiseCallback.onStartSuccess"

7 years agoRevert "AdapterService: enforce new user restriction for disallowing Bluetooth."
ltrochtova [Thu, 1 Dec 2016 20:48:06 +0000 (20:48 +0000)]
Revert "AdapterService: enforce new user restriction for disallowing Bluetooth."

This reverts commit 1f802f2473b5f8b8a401bcd9c7273d21b27d4bc2.

Change-Id: Ic5ffcf4e1ad9d024646363fa83094997058dd05b

7 years agoFix null settings in AdvertiseCallback.onStartSuccess
Jakub Pawlowski [Thu, 1 Dec 2016 17:21:06 +0000 (09:21 -0800)]
Fix null settings in AdvertiseCallback.onStartSuccess

Test: acts FilteringTest
Bug: 33171815
Bug: 30622771
Change-Id: Ib3df1d13535999ede0e820651fc6d69daeb8ef17

7 years agoMerge "AdapterService: enforce new user restriction for disallowing Bluetooth."
ltrochtova [Thu, 1 Dec 2016 13:40:28 +0000 (13:40 +0000)]
Merge "AdapterService: enforce new user restriction for disallowing Bluetooth."

7 years agoAdapterService: enforce new user restriction for disallowing Bluetooth.
Lenka Trochtova [Thu, 24 Nov 2016 15:54:17 +0000 (16:54 +0100)]
AdapterService: enforce new user restriction for disallowing Bluetooth.

Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.UserRestrictionsTest
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction

Bug: 32895300

Change-Id: I9bc69b4f4886e9d61574ed1a717371d035eb9776

7 years agoMerge "Add Bluetooth device address parameter to HF Client APIs"
Sanket Agarwal [Wed, 30 Nov 2016 01:28:46 +0000 (01:28 +0000)]
Merge "Add Bluetooth device address parameter to HF Client APIs"
am: f7d1e331cb

Change-Id: Ifdb0b617841ea38e4afe2d9ea8faeb65a4c3e1a1

7 years agoMerge "Add Bluetooth device address parameter to HF Client APIs"
Sanket Agarwal [Wed, 30 Nov 2016 01:23:42 +0000 (01:23 +0000)]
Merge "Add Bluetooth device address parameter to HF Client APIs"

7 years agoMerge "Disable HFP audio path when HFP call goes on hold/resume when goes off hold"
Sanket Agarwal [Tue, 29 Nov 2016 22:32:03 +0000 (22:32 +0000)]
Merge "Disable HFP audio path when HFP call goes on hold/resume when goes off hold"
am: d13d573c0a

Change-Id: I358a75c0b793d81c56107094f46cea37c07185a4

7 years agoAdd Bluetooth device address parameter to HF Client APIs
Sanket Agarwal [Mon, 28 Nov 2016 23:53:06 +0000 (15:53 -0800)]
Add Bluetooth device address parameter to HF Client APIs

Bug: 30984220
Test: SL4A tests for HFP

Change-Id: Ic03dd8fab87c3ed7ea83a617fc18426427020182

7 years agoMerge "Disable HFP audio path when HFP call goes on hold/resume when goes off hold"
Sanket Agarwal [Tue, 29 Nov 2016 22:27:37 +0000 (22:27 +0000)]
Merge "Disable HFP audio path when HFP call goes on hold/resume when goes off hold"

7 years agoDisable HFP audio path when HFP call goes on hold/resume when goes off hold
Christine Hallstrom [Thu, 27 Oct 2016 20:14:08 +0000 (13:14 -0700)]
Disable HFP audio path when HFP call goes on hold/resume when goes off hold

This fixes the issue where a cellular call made to a watch when an
HFP call is in progress causes the cellular audio to go through the
HFP path.

Bug: 32164561
Change-Id: I179ba4e1f1a1e76496f3062cc29bc20014fe5661
(cherry picked from commit 3ee63fdfb7fa5896bff7e172be60c763919c9f63)

7 years agoMerge "Cleanup startAdvertising call"
Jakub Pawlowski [Mon, 28 Nov 2016 20:45:22 +0000 (20:45 +0000)]
Merge "Cleanup startAdvertising call"
am: 676347ddce

Change-Id: Icc388d93446ddd689af2d4e040e5d44565fcd379

7 years agoMerge "Cleanup startAdvertising call"
Treehugger Robot [Mon, 28 Nov 2016 20:38:04 +0000 (20:38 +0000)]
Merge "Cleanup startAdvertising call"

7 years agoCleanup startAdvertising call
Jakub Pawlowski [Wed, 23 Nov 2016 19:43:37 +0000 (11:43 -0800)]
Cleanup startAdvertising call

AdvertiseManager.startAdvertising no longer sends multiple commands.
Its native counterpart, BleAdvertisingManagerImpl.RegisterAdvertiser,
thanks to better tests, guarantees that it either sends a success or
error callback. Therefore, no additional synchronization is required.

The only cases when the native code can get executed without a callback
are when the controller sends no response, or the bta thread is stuck.
Both of those cases should result in a crash and restart of bluetooth.

This patch also fixes an error, where if a timeout happens, the  error
callback gets called twice.

Bug: 30622771
Test: sl4a ConcurrentBleAdvertising
Change-Id: I72a729f4da2bd8d5d62a81a6f93dbadab088a036

7 years agoMerge "Remove unnecessary advertiser count check"
Jakub Pawlowski [Wed, 23 Nov 2016 01:56:58 +0000 (01:56 +0000)]
Merge "Remove unnecessary advertiser count check"
am: 8fc01bd0eb

Change-Id: Ie5e41217486cbe2558f28c8d82d4aeef02c1a486

7 years agoMerge "Remove unnecessary advertiser count check"
Treehugger Robot [Wed, 23 Nov 2016 01:51:51 +0000 (01:51 +0000)]
Merge "Remove unnecessary advertiser count check"

7 years agoRemove unnecessary advertiser count check
Jakub Pawlowski [Tue, 22 Nov 2016 23:46:51 +0000 (15:46 -0800)]
Remove unnecessary advertiser count check

Bluetooth stack won't allow to register more advertisers that it can
handle, so checking count of registered advertisers make no sense when
calling startAdvertising.

Bug: 30622771
Test: sl4a ConcurrentBleAdvertisingTest
Change-Id: Ifbaf583871cf59ce8e345d7bca8e9a9ea1540734

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 21 Nov 2016 00:31:06 +0000 (16:31 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 32177112
Change-Id: I9178e13ccd88e7885dab8a5eb5099d26d1b20b6e

7 years agoMerge "Move tests from */bluetooth/test/* to */bluetooth/*"
Jakub Pawlowski [Sat, 19 Nov 2016 04:11:46 +0000 (04:11 +0000)]
Merge "Move tests from */bluetooth/test/* to */bluetooth/*"
am: 997db4947e

Change-Id: I0d6a233b62732a9872798f56c832d497e257745f

7 years agoMerge "Move tests from */bluetooth/test/* to */bluetooth/*"
Treehugger Robot [Sat, 19 Nov 2016 04:06:33 +0000 (04:06 +0000)]
Merge "Move tests from */bluetooth/test/* to */bluetooth/*"

7 years agoMerge "Move some AdvertiseManager methods into separate helper"
Jakub Pawlowski [Sat, 19 Nov 2016 02:39:10 +0000 (02:39 +0000)]
Merge "Move some AdvertiseManager methods into separate helper"
am: 84ea420ee9

Change-Id: I42b2f8b3ef158e421982ccd9893e08f5c7f38378

7 years agoMove some AdvertiseManager methods into separate helper
Jakub Pawlowski [Sat, 19 Nov 2016 02:39:10 +0000 (02:39 +0000)]
Move some AdvertiseManager methods into separate helper
am: 335fb7b425

Change-Id: I9336088e214841f6f7530f2b54209891ff4302bd

7 years agoMove tests from */bluetooth/test/* to */bluetooth/*
Jakub Pawlowski [Fri, 18 Nov 2016 23:17:11 +0000 (15:17 -0800)]
Move tests from */bluetooth/test/* to */bluetooth/*

Right now the folder structure is not in sync with package names.

Change-Id: I0458795a68ba32c0ebec6721f7688ca4e6ff0b1d

7 years agoMerge "Move some AdvertiseManager methods into separate helper"
Treehugger Robot [Sat, 19 Nov 2016 02:33:01 +0000 (02:33 +0000)]
Merge "Move some AdvertiseManager methods into separate helper"

7 years agoMove some AdvertiseManager methods into separate helper
Jakub Pawlowski [Fri, 18 Nov 2016 23:09:41 +0000 (15:09 -0800)]
Move some AdvertiseManager methods into separate helper

This patch is moving some methods from AdvertiseManager into a
AdvertiseHelper. This is a preparation to add tests to
advertiseDataToBytes and others.

Bug: 30622771
Test: sl4a ConcurrentBleAdvertisingTest BleAdvertiseApiTest
Change-Id: I41f857379c892f76a5cec807879722764ef3cfa7

7 years agoMerge "Move startAdvertising() logic into native code (1/3)"
Jakub Pawlowski [Fri, 18 Nov 2016 22:36:55 +0000 (22:36 +0000)]
Merge "Move startAdvertising() logic into native code (1/3)"
am: 2f41316dc0

Change-Id: Ieaa5dffe7eeb6ddf8c38391dd2a36bf8686fbbc9

7 years agoMove startAdvertising() logic into native code (1/3)
Jakub Pawlowski [Fri, 18 Nov 2016 22:35:56 +0000 (22:35 +0000)]
Move startAdvertising() logic into native code (1/3)
am: e82cce565b

Change-Id: I6e9cf2db1974c893bfed648cffae627e2b53b9c5

7 years agoMerge "Move startAdvertising() logic into native code (1/3)"
Jakub Pawlowski [Fri, 18 Nov 2016 22:28:55 +0000 (22:28 +0000)]
Merge "Move startAdvertising() logic into native code (1/3)"

7 years agoMove startAdvertising() logic into native code (1/3)
Jakub Pawlowski [Thu, 17 Nov 2016 21:17:04 +0000 (13:17 -0800)]
Move startAdvertising() logic into native code (1/3)

AdvertiseManager.startAdvertising() was implemented in Java layer for
historical reasons. Now that we have nice native callbacks and tests,
it can be moved into native code, where it will be shared between
Android daemon and bluetoothtbd.

Bug: 30622771
Test: native tests added to cover startAdvertising
Change-Id: Ifee1fc74ad3e749ffc0c6a734e450c540b5b59bb

7 years agoMerge "Fix NPE in createBond"
Jakub Pawlowski [Wed, 16 Nov 2016 21:53:14 +0000 (21:53 +0000)]
Merge "Fix NPE in createBond"
am: 2beef8d589

Change-Id: I97256a6d98bfcd694e2abd55e8892228615c09e8

7 years agoMerge "Fix NPE in createBond"
Jakub Pawlowski [Wed, 16 Nov 2016 21:40:35 +0000 (21:40 +0000)]
Merge "Fix NPE in createBond"

7 years agoFix NPE in createBond
Jakub Pawlowski [Wed, 16 Nov 2016 18:29:17 +0000 (10:29 -0800)]
Fix NPE in createBond

Bug: 32925925
Test: initiate bonding locally using NFC OOB
Change-Id: I9aadea84e9e2e57cf75c02affa618eb37a33a767

7 years agoMerge "Protect against SQLiteException crash in MAP init"
Ajay Panicker [Tue, 15 Nov 2016 22:34:30 +0000 (22:34 +0000)]
Merge "Protect against SQLiteException crash in MAP init"
am: a0753c2c96

Change-Id: I0ac00f14ee5c1a95472d14ac036f845df86f7d60

7 years agoMerge "Protect against SQLiteException crash in MAP init"
Treehugger Robot [Tue, 15 Nov 2016 22:21:46 +0000 (22:21 +0000)]
Merge "Protect against SQLiteException crash in MAP init"

7 years agoProtect against SQLiteException crash in MAP init
Ajay Panicker [Thu, 10 Nov 2016 01:11:40 +0000 (17:11 -0800)]
Protect against SQLiteException crash in MAP init

Bug: 32717472
Test: runtest bluetooth
Change-Id: I533d7ca0b281291f931f4aca271ea9ff3214bdf2

7 years agoMerge "Use ENTERPRISE_CONTENT_FILTER_URI for phone lookup URI"
Yoshiharu Kurita [Tue, 15 Nov 2016 04:29:32 +0000 (04:29 +0000)]
Merge "Use ENTERPRISE_CONTENT_FILTER_URI for phone lookup URI"
am: 5b71cc4c23

Change-Id: Ie838a43f90e7f167ffe290bccf97f400718b4e23

7 years agoMerge "Use ENTERPRISE_CONTENT_FILTER_URI for phone lookup URI"
Treehugger Robot [Tue, 15 Nov 2016 04:23:44 +0000 (04:23 +0000)]
Merge "Use ENTERPRISE_CONTENT_FILTER_URI for phone lookup URI"

7 years agoUse ENTERPRISE_CONTENT_FILTER_URI for phone lookup URI
Yoshiharu Kurita [Mon, 7 Dec 2015 13:30:15 +0000 (22:30 +0900)]
Use ENTERPRISE_CONTENT_FILTER_URI for phone lookup URI

To retrieve not only personal caller-id but also corporate caller-id,
we need to use ENTERPRISE_CONTENT_FILTER_URI for phone lookup URI
instead of CONTENT_FILTER_URI.
This modification is required by Android for Work.

Bug: 28947490
Change-Id: Iee51c1bebf8ee41668bec305cf37d2cdfdda5e2e

7 years agoMerge "Unify advertising API (3/3)"
Jakub Pawlowski [Fri, 11 Nov 2016 23:48:57 +0000 (23:48 +0000)]
Merge "Unify advertising API (3/3)"
am: e19d38fd41

Change-Id: I9770b855ffa0f9cab36c06f499ec60a51bd54a63

7 years agoMerge "Unify advertising API (3/3)"
Jakub Pawlowski [Fri, 11 Nov 2016 23:33:14 +0000 (23:33 +0000)]
Merge "Unify advertising API (3/3)"

7 years agoMerge "BLE OOB Pairing - parse address type (3/5)"
Jakub Pawlowski [Thu, 10 Nov 2016 20:07:46 +0000 (20:07 +0000)]
Merge "BLE OOB Pairing - parse address type (3/5)"
am: 11ed88c2eb

Change-Id: I8f53c4ab24c4b636025a0ce1d32f628f53bcf2e4

7 years agoMerge "BLE OOB Pairing - parse address type (3/5)"
Treehugger Robot [Thu, 10 Nov 2016 20:00:50 +0000 (20:00 +0000)]
Merge "BLE OOB Pairing - parse address type (3/5)"

7 years agoBLE OOB Pairing - parse address type (3/5)
Jakub Pawlowski [Thu, 10 Nov 2016 00:47:21 +0000 (16:47 -0800)]
BLE OOB Pairing - parse address type (3/5)

When address type is not parsed, creating bond to devices not using
random address is impossible.

Bug: 32780409
Test: try pairing with nRF52DK using random address
Change-Id: Ifae63995e5ffb3a5071d0c993a0e15c0b6e8a7eb

7 years agoUnify advertising API (3/3)
Jakub Pawlowski [Fri, 4 Nov 2016 19:06:30 +0000 (12:06 -0700)]
Unify advertising API (3/3)

This patch unifies advertising API. On startup, if VSC multi advertising
is avaliable, it will be used, otherwise
BleAdvertiserLegacyHciInterfaceImpl will be used, which provides one
advertising instance.

Test: sl4a tests are passing, all proper tests updated accordingly
Change-Id: I899ed51bf4e747e1e3ff1a472a55f060249cbb75

7 years agoMerge "Don't override target to 32 for Bluetooth"
Jakub Pawlowski [Fri, 4 Nov 2016 22:30:17 +0000 (22:30 +0000)]
Merge "Don't override target to 32 for Bluetooth"
am: 3db6d606a3

Change-Id: Ia69dd23958bdcaa8d810017a76565e7024986122

7 years agoMerge "Don't override target to 32 for Bluetooth"
Jakub Pawlowski [Fri, 4 Nov 2016 22:24:34 +0000 (22:24 +0000)]
Merge "Don't override target to 32 for Bluetooth"

7 years agoDon't override target to 32 for Bluetooth
Jakub Pawlowski [Thu, 3 Nov 2016 20:50:44 +0000 (13:50 -0700)]
Don't override target to 32 for Bluetooth

Change-Id: I1f72dec4376bb55e72d15df5af548cf4ce123c31

7 years agoMerge "BLE Check and send scan response data"
Chris Manton [Thu, 3 Nov 2016 20:02:09 +0000 (20:02 +0000)]
Merge "BLE Check and send scan response data"
am: 97f86114a4

Change-Id: I34d73f42bd2403aea99621838ab55b8c0f1c2d56

7 years agoMerge "BLE Check and send scan response data"
Chris Manton [Thu, 3 Nov 2016 19:57:55 +0000 (19:57 +0000)]
Merge "BLE Check and send scan response data"

7 years agoMerge changes I7f2e3ac0,Ibcd26731,I9ac5121c,Ie9135167,Ib02c74c7, ...
Sanket Agarwal [Wed, 2 Nov 2016 05:27:25 +0000 (05:27 +0000)]
Merge changes I7f2e3ac0,Ibcd26731,I9ac5121c,Ie9135167,Ib02c74c7, ...
am: 81bdaeea0f

Change-Id: Iac47952d1ac4ca5fdf8883a802492a37a8054d45

7 years agoFixing A2dpSinkStreamingStateMachine thread leak.
Ram Periathiruvadi [Wed, 2 Nov 2016 05:27:24 +0000 (05:27 +0000)]
Fixing A2dpSinkStreamingStateMachine thread leak.
am: f00c68aeda

Change-Id: I1119f2ec7a050a0f76633f842e51b3aef778ec69

7 years agoNow Playing List gets stuck in a loop
Sanket Agarwal [Wed, 2 Nov 2016 05:27:23 +0000 (05:27 +0000)]
Now Playing List gets stuck in a loop
am: 609f94bb87

Change-Id: Icd7d8a87b3d1840e37dbe80097a1c638e4923d45

7 years agoMAP Client connect after PBAP Client
Joseph Pirozzo [Wed, 2 Nov 2016 05:27:22 +0000 (05:27 +0000)]
MAP Client connect after PBAP Client
am: 2ad555291d

Change-Id: I1d54810f796fbad50b95a5f3552001826cd5d9c8

7 years agoMAP MCE iPhone connectivity
Joseph Pirozzo [Wed, 2 Nov 2016 05:27:21 +0000 (05:27 +0000)]
MAP MCE iPhone connectivity
am: c1c6d1d504

Change-Id: Ic40593a9bd0682ae099153995340b58e5008c1cb

7 years agoMAP MCE disconnecting automatically
Joseph Pirozzo [Wed, 2 Nov 2016 05:27:20 +0000 (05:27 +0000)]
MAP MCE disconnecting automatically
am: 7adf1f5877

Change-Id: I7dc26938faa42847a6de2c30bf0617b1dd8a5820

7 years agoMAP MCE message filtering
Joseph Pirozzo [Wed, 2 Nov 2016 05:27:19 +0000 (05:27 +0000)]
MAP MCE message filtering
am: 12ae7442e5

Change-Id: I16d85f63df0c390c4f437e9bda143725f3ae5f4c

7 years agoSet debug flags to false
Sanket Agarwal [Wed, 2 Nov 2016 05:27:18 +0000 (05:27 +0000)]
Set debug flags to false
am: 763f0e3db6

Change-Id: I2732c0f72d32d6b3cdc9fb1596bc4a00b5135a9a

7 years agoMerge changes I7f2e3ac0,Ibcd26731,I9ac5121c,Ie9135167,Ib02c74c7, ...
Sanket Agarwal [Wed, 2 Nov 2016 05:23:06 +0000 (05:23 +0000)]
Merge changes I7f2e3ac0,Ibcd26731,I9ac5121c,Ie9135167,Ib02c74c7, ...

* changes:
  Fixing A2dpSinkStreamingStateMachine thread leak.
  Now Playing List gets stuck in a loop
  MAP Client connect after PBAP Client
  MAP MCE iPhone connectivity
  MAP MCE disconnecting automatically
  MAP MCE message filtering
  Set debug flags to false

7 years agoFixing A2dpSinkStreamingStateMachine thread leak.
Ram Periathiruvadi [Fri, 14 Oct 2016 19:50:45 +0000 (12:50 -0700)]
Fixing A2dpSinkStreamingStateMachine thread leak.

A2dpSinkStreamingStateMachine was being created on every Connection
leading to a leak. Fix is to Quit the A2dpSinkStreamingStateMachine
on A2dpSinkStateMachine's Quit() and create a new Streaming
StateMachine only if it is null.
Note that both the Sink and SinkStreaming State machines quit only
on Adapter off, not on BT disconnect.

Bug: b/32097580
Tested: On Mojave and Angler with bat_mas-userdebug

Change-Id: I7f2e3ac01ce5ff965afe407e3605cac00497af36
(cherry picked from commit af41a720081dd4e9d12e1b3f082e9202ae84252d)

7 years agoNow Playing List gets stuck in a loop
Sanket Agarwal [Wed, 12 Oct 2016 09:41:30 +0000 (02:41 -0700)]
Now Playing List gets stuck in a loop

We are incorrectly setting the status of the Now Playing List folder to
uncached which makes it fetch the folder in a loop if there is possible
pagination going on

Bug: b/32051433
Change-Id: Ibcd26731c7ed4ac24d816c2f4529970e3a2f29cd
(cherry picked from commit ffded42f4a30a399738f23a4d36068e484fea8cb)

7 years agoMAP Client connect after PBAP Client
Joseph Pirozzo [Thu, 13 Oct 2016 20:47:54 +0000 (13:47 -0700)]
MAP Client connect after PBAP Client

Add code to automatically attempt to connect MAP Client (if enabled)
after PBAP Client connects.  This will typically be invoked at system or
adapter reset, but could as well happen if MAP Client isn't connected
and a new PBAP connection is established.

Bug: 32153228
Change-Id: I9ac5121ccf0d7ef3e5847df32034094e085aa434
(cherry picked from commit 46873217f3ddb8b848ce0b8fdf4a0531dfb04224)

7 years agoMAP MCE iPhone connectivity
Joseph Pirozzo [Thu, 13 Oct 2016 16:59:56 +0000 (09:59 -0700)]
MAP MCE iPhone connectivity

iPhones do not fill in the tel: field in the originators vCard upon
receipt of a text message, this was causing parsing to fail as it was
assumed that every SMS message will have an associated phone number.
Updated logic to check fields more riggorously.

Bug: 32110763
Change-Id: Ie9135167ad957a2a8054ea414d3e9ec576d3271b
(cherry picked from commit b2e57a501b1719406776c795cfed4fd271707d79)

7 years agoMAP MCE disconnecting automatically
Joseph Pirozzo [Tue, 11 Oct 2016 20:36:49 +0000 (13:36 -0700)]
MAP MCE disconnecting automatically

Disconnect commands were getting queued even if bluetooth wasn't
connected.  This would cause the disconnect command to get processed
immediately after the connection succeeded.  Updated logic to defer all
commands while "Connecting" or "Disconnecting" throw out any disconnect
commands at the head of the queue while "Disconnected" and generate
implied disconnect commands when a connect command arived while already
Connected.

Bug: 32080718
Change-Id: Ib02c74c753e88cf4876835ee8e5e0c8f2a6ebc34
(cherry picked from commit 2e8805b2ad2e8b70fb82fde37498922c92d15cb6)

7 years agoMAP MCE message filtering
Joseph Pirozzo [Fri, 7 Oct 2016 01:27:00 +0000 (18:27 -0700)]
MAP MCE message filtering

Remove message filtering from getUnreadMessages to allow all message
types supported by the MAS Server to be sent.

Bug: 32004537
Change-Id: Id88401bd290c3a33deb99da3d1673becebe40c7f
(cherry picked from commit 625bb6b6ad191d128b1404f457225cb94b7e70f4)

7 years agoSet debug flags to false
Sanket Agarwal [Thu, 6 Oct 2016 19:53:59 +0000 (12:53 -0700)]
Set debug flags to false

- Reduces the log spam
- Eliminates any PII information in the logs

Bug: b/31811551
Change-Id: I5c421ad50706043765ef3e82cb37a44d520ecb6e
(cherry picked from commit 8964818100fb71fa1f962aeb55fc1dd54e7a9fbd)

7 years agoMerge "PBAP Logging"
Joseph Pirozzo [Wed, 2 Nov 2016 04:13:45 +0000 (04:13 +0000)]
Merge "PBAP Logging"
am: 1826359356

Change-Id: I3416940523563faaefe112564fb01344f0f579af

7 years agoMerge "PBAP Logging"
Treehugger Robot [Wed, 2 Nov 2016 04:11:07 +0000 (04:11 +0000)]
Merge "PBAP Logging"

7 years agoPBAP Logging
Joseph Pirozzo [Thu, 6 Oct 2016 19:06:40 +0000 (12:06 -0700)]
PBAP Logging

Move information about how many entries were synced to VDBG (and
disable) to protect any possible PII in logs.

Bug: 31855210
Change-Id: I67b0566d063411997ffda926cecd2e889f309b13
(cherry picked from commit ec955102ce72d61635f9eca1d904d803698949ac)

7 years agoMerge "Protect against adding a null config for the BT health profile"
Ajay Panicker [Wed, 2 Nov 2016 01:20:34 +0000 (01:20 +0000)]
Merge "Protect against adding a null config for the BT health profile"
am: f8727080ea

Change-Id: I96dc9eb3b033518474700ef05942d1e8a18d645b

7 years agoMerge "Protect against adding a null config for the BT health profile"
Treehugger Robot [Wed, 2 Nov 2016 01:18:18 +0000 (01:18 +0000)]
Merge "Protect against adding a null config for the BT health profile"

7 years agoMerge "MAP MCE"
Sanket Agarwal [Wed, 2 Nov 2016 01:08:03 +0000 (01:08 +0000)]
Merge "MAP MCE"
am: db95af257e

Change-Id: Ib8635558016c225d8b00b6ed83464d01ba839cf8

7 years agoMerge "MAP MCE"
Sanket Agarwal [Wed, 2 Nov 2016 00:54:57 +0000 (00:54 +0000)]
Merge "MAP MCE"