Commit Graph

1342 Commits

Author SHA1 Message Date
Zach Johnson
a0909a416f Merge "Pass package name as part of startDiscovery" am: bee9a87193 am: 683e379471
am: ff44d968eb

Change-Id: I6bfc7638d6f4e3487ece2452743c68150aaaf754
2018-12-13 15:05:09 -08:00
Zach Johnson
ff44d968eb Merge "Pass package name as part of startDiscovery" am: bee9a87193
am: 683e379471

Change-Id: I8dee413204c52bd715403d13696939930220cb10
2018-12-13 14:07:36 -08:00
Zach Johnson
57e6e90204 Pass package name as part of startDiscovery
Test: manual
Bug: 118347252
Change-Id: Icbc2e7e756b16ffd181924b586a0292c2bf32ec5
2018-12-12 20:33:09 -08:00
Myles Watson
18f1d2adc9 Merge "BluetoothManager: Set DBG to false" am: c4ce66dd2f am: 1fe951bf59
am: 64c6700af6

Change-Id: I1b3a38128b6ebee300a72efb306c10462236d4bc
2018-12-03 09:12:03 -08:00
Jakub Pawlowski
e83e0abfe7 Bluetooth: Check descriptors size in BluetoothHidDeviceAppSdpSettings am: 63519217e8
am: 520a94aa47

Change-Id: Ie8dd4e851866092ce6b857707681229f35c1b557
2018-12-03 06:53:34 -08:00
Myles Watson
64c6700af6 Merge "BluetoothManager: Set DBG to false" am: c4ce66dd2f
am: 1fe951bf59

Change-Id: Ia2e6dd5e7670818b9e2d7de920b8a5f4e465e13a
2018-11-30 21:18:37 -08:00
Treehugger Robot
c4ce66dd2f Merge "BluetoothManager: Set DBG to false" 2018-12-01 04:44:09 +00:00
Jakub Pawlowski
520a94aa47 Bluetooth: Check descriptors size in BluetoothHidDeviceAppSdpSettings
am: 63519217e8

Change-Id: I42a61e190fc9c37b8f19623a77b3a16ba924fc70
2018-11-30 00:29:37 -08:00
Jakub Pawlowski
63519217e8 Bluetooth: Check descriptors size in BluetoothHidDeviceAppSdpSettings
Bug: 119819889
Test: compilation
Change-Id: If51d0e2af74d99758f79a603d40cc2f5c84e4dde
2018-11-29 20:44:18 +01:00
Jakub Pawlowski
9676bc2d4d Merge "Bluetooth: Fix NPE when accesing Manufacturer Data of invalid ScanRecord" am: 658e6530ba am: 591a68a5a1
am: 587a8acb6c

Change-Id: I88459ae16e0492ea877983252aae03ad5714a306
2018-11-29 00:39:27 -08:00
Jakub Pawlowski
587a8acb6c Merge "Bluetooth: Fix NPE when accesing Manufacturer Data of invalid ScanRecord" am: 658e6530ba
am: 591a68a5a1

Change-Id: I3c8f931cfea06e44853bd21ffd237562b4f45677
2018-11-29 00:22:00 -08:00
Jakub Pawlowski
4c2aa61202 Bluetooth: Fix NPE when accesing Manufacturer Data of invalid ScanRecord
Bug: 118805852
Test: compilation
Change-Id: I537bec61cd3e7df700cc972683458f977ff370b8
2018-11-29 07:20:53 +00:00
Benson Li
3328a2ca25 Merge "HFP: Send caller ID in +CLIP command (1/4)" am: 6c4c8aeb70 am: d09c0d88e4
am: 66ba8e8dbc

Change-Id: I1ecad6c8d3defd67fd06cb25c32243cd7c4f80a3
2018-11-21 13:39:39 -08:00
Benson Li
66ba8e8dbc Merge "HFP: Send caller ID in +CLIP command (1/4)" am: 6c4c8aeb70
am: d09c0d88e4

Change-Id: Ic628b5d6b3e4062388523f008ad4257c27bae71d
2018-11-21 13:22:43 -08:00
Treehugger Robot
6c4c8aeb70 Merge "HFP: Send caller ID in +CLIP command (1/4)" 2018-11-21 20:21:19 +00:00
Hansong Zhang
af3d69b258 Merge "BluetoothDevice.ACTION_UUID requires BLUETOOTH_ADMIN" am: 215a48cff4 am: 652dffda0b
am: a7063f1830

Change-Id: Ib879f947b1db9579ec46efc79351a3b9247c09c8
2018-11-20 18:35:26 -08:00
Hansong Zhang
a7063f1830 Merge "BluetoothDevice.ACTION_UUID requires BLUETOOTH_ADMIN" am: 215a48cff4
am: 652dffda0b

Change-Id: I7ea71f54d211bf4656472b9a40cd6996507eaa18
2018-11-20 18:23:10 -08:00
Treehugger Robot
215a48cff4 Merge "BluetoothDevice.ACTION_UUID requires BLUETOOTH_ADMIN" 2018-11-21 01:58:32 +00:00
Stanley Tng
a944152a99 Merge "Enable the Debug Logs for Hearing Aids Profile" am: 7271c452a9 am: b6987e3c3c
am: 56f272547f

Change-Id: I1a664cf14d7f132abb9919fb3ba11d111fbb1e7b
2018-11-20 17:55:08 -08:00
Stanley Tng
56f272547f Merge "Enable the Debug Logs for Hearing Aids Profile" am: 7271c452a9
am: b6987e3c3c

Change-Id: I4708bea946177b47beb78845a49f082df96e7ede
2018-11-20 17:43:46 -08:00
Stanley Tng
420a0eb576 Enable the Debug Logs for Hearing Aids Profile
Bug: 119617521
Test: Compile
Change-Id: I40de1fcb3ca9e0ee66b4650a161f3735722df7ed
2018-11-15 10:22:07 -08:00
Myles Watson
3ee31a7ac6 BluetoothManager: Set DBG to false
Fixes: 71491860
Test: Pair and connect with a phone
Change-Id: I3ead8154765267105c74cd800f571933bbe82e07
2018-11-15 13:58:42 +00:00
Hansong Zhang
ff1c21c94c BluetoothDevice.ACTION_UUID requires BLUETOOTH_ADMIN
Fix the doc - intent BluetoothDevice.ACTION_UUID requries
android.Manifest.permission#BLUETOOTH_ADMIN instead of #BLUETOOTH to
receive. This is already enforced by Bluetooth service.

Bug: 113160320
Test: manual
Change-Id: I977d58e6d534f512da80bd6b13bebb515765626f
2018-11-12 14:33:59 -08:00
Benson Li
1d4f64ac7c HFP: Send caller ID in +CLIP command (1/4)
* Modify BluetoothHeadset so that phoneStateChanged method can
  provide caller display name

Bug: 111378831
Test: runtest bluetooth, runtest -x BluetoothPhoneServiceTest.java
Change-Id: Ibc3611a50ec9f103fd235dde606ecbd10657e014
2018-11-09 20:11:04 +00:00
TreeHugger Robot
022cf30d17 Merge "Be the current user to get A2DP proxy" into pi-dev 2018-10-30 22:22:14 +00:00
Nathan Harold
41e2d7494f Merge "Move some members to the "Q blacklist"." am: f5cf9f24ed
am: 13c9e7e2f3

Change-Id: Ia2419cce28d26d9464da2a5172cb332b629e943e
2018-10-24 16:14:06 -07:00
Mathew Inwood
45d2c252b1 Move some members to the "Q blacklist".
Based on some analysis, these fields/methods are likely false positives.
Set maxTargetSdk=P so that any apps using them are required to migrate off
them in future. See the bug for more details.

Exempted-From-Owner-Approval: Automatic changes to the codebase
affecting only @UnsupportedAppUsage annotations, themselves added
without requiring owners approval earlier.

Bug: 115609023
Test: m
Merged-In: I719b5c94e5b1f4fa562dd5d655953422958ad37e
Change-Id: I719b5c94e5b1f4fa562dd5d655953422958ad37e
(cherry picked from commit 8c854f86a4)
2018-10-22 17:28:24 -07:00
Jovana Knezevic
6194930dae Merge "Makes bluetooth profile services bind to current (foreground) user." 2018-10-19 19:47:15 +00:00
Ajay Panicker
a42f058908 Merge "Synchronize on a static final object to lock mDeviceBusy" am: 34f9a3e9e9 am: 56d37b7c43
am: 9020cf9a48

Change-Id: Ia12ca64ff5acca55182bac2fb8bae2523c7fc06a
2018-10-18 23:44:18 -07:00
Ajay Panicker
9020cf9a48 Merge "Synchronize on a static final object to lock mDeviceBusy" am: 34f9a3e9e9
am: 56d37b7c43

Change-Id: Ic53518b0e62803bb68b60ed318d6a0825b192164
2018-10-18 23:34:44 -07:00
Ajay Panicker
6c96b70195 Synchronize on a static final object to lock mDeviceBusy
Synchronizing on a field doesn't lock the object in a predictable way.

Bug: 63389270
Test: Compile
Change-Id: Idd3111bc94d32bc4bb320a5c25da37fe68276337
2018-10-17 18:20:51 +00:00
jovanak
2a9131f768 Makes bluetooth profile services bind to current (foreground) user.
If profile services are created from a singleton process
(like SystemUI), they need to be re-bind to a new foreground user
when we switch to a secondary user.
This is achieved by binding to UserHandle.CURRENT_OR_SELF.

If the process doesn't have adequate permissions to bind to current,
it will bind to self (which is the same as the previous behavior).

Change-Id: Ib1134a1a62887d6f5b2c97301dccd3223ade9ed2
Fixes: 117517812
Test: ran the existing core bluetooth tests; manual testing on a mojave, verifying that the service correctly rebinds from sys ui after user switch.
2018-10-15 17:50:19 -07:00
Jack He
7ccf46bed5 Merge "Remove BluetoothDevice.ACTION_DISAPPEARED" am: 2ac8c8a3e2 am: 24591d2641
am: 94405bb133

Change-Id: Ie2dd54ebdd4cd71ca89d263ec738f6c4a90cfac7
2018-10-12 11:32:41 -07:00
Jack He
94405bb133 Merge "Remove BluetoothDevice.ACTION_DISAPPEARED" am: 2ac8c8a3e2
am: 24591d2641

Change-Id: Idc687ad7ea25b793f5ef12612e161e197d87679d
2018-10-12 11:18:09 -07:00
Nan Zhang
248b8391ca Merge "Fix the incorrect javadoc links" into pi-dev-plus-aosp
am: 83fb35ad23

Change-Id: I48248b92a2c9f3214c88c3045f67e153f21c826f
2018-10-11 20:13:39 -07:00
Nan Zhang
55581d99b5 Fix the incorrect javadoc links
A lot of unresolved link errors showing up after go/ag/5172152.

Test: m -j docs with -lerror enabled
Bug: b/116163454
Change-Id: I74d1f75e0f00015410a63e13103c28a9c84b4fe0
2018-10-11 17:54:36 -07:00
Jack He
097a89513e Remove BluetoothDevice.ACTION_DISAPPEARED
This intent was never sent by the Bluetooth stack

Fixes: 112115770
Test: make
Change-Id: Iaf71aeafa21f44ec9b59c1b766c936ab7dde39f1
2018-10-11 21:06:29 +00:00
kopriva
b0353c56e0 docs: fixing errors found with lint checker am: 219f7dcb66
am: 003587b9a4

Change-Id: I056261f069ed679ed8a03bfc0791bfe59a405361
2018-10-10 19:41:15 -07:00
kopriva
003587b9a4 docs: fixing errors found with lint checker
am: 219f7dcb66

Change-Id: Id38a4b2e21285d5d5e2a2124d76885febd3441c6
2018-10-09 18:30:57 -07:00
kopriva
219f7dcb66 docs: fixing errors found with lint checker
through /bluetooth directory

amending through /content directory

Test: make ds-docs

Bug: 117494359

Change-Id: I751e15d60f0b9cc441998b27560050bf62994fef
Exempt-From-Owner-Approval: Docs-only change
2018-10-09 16:01:04 -07:00
Andrew Solovay
d10e384d6c resolve merge conflicts of a3e34fe9fe to pi-dev-plus-aosp
Bug: None
Test: Eyeballed (comment-only change).
Change-Id: Ia644cde66376b2bddeb27bb2a147b3266037aa2c
Exempt-From-Owner-Approval: Docs-only change
Merged-In: Ia06e1fffd814671289a1caebd5962aedc18a28d7
2018-10-04 22:50:39 +00:00
Andrew Solovay
a44f2c075b docs: Replacing {#link with {@link
Several java files had the typo {#link (for cross-references to other
Javadocs) instead of the proper {@link format. This was confusing the
new doc publish tool (Mivi) since that's the format used for {# Django
comments #}.

Fixed a couple of links that had other errors (which prevented building
once the {# -> {@ was done) and other typos.

Replaced throughout the frameworks/base project; I'll need a separate CL
for the AndroidX fixes.

Staged to:

go/dac-stage/reference/android/app/Instrumentation.html
go/dac-stage/reference/android/bluetooth/BluetoothAdapter.html
go/dac-stage/reference/android/bluetooth/BluetoothDevice.html
go/dac-stage/reference/android/bluetooth/BluetoothServerSocket.html
go/dac-stage/reference/android/inputmethodservice/InputMethodService.html
go/dac-stage/reference/android/view/KeyCharacterMap.html
go/dac-stage/reference/android/view/KeyEvent.html
go/dac-stage/reference/android/media/AudioManager.html
go/dac-stage/reference/android/net/wifi/WifiConfiguration.html

(Other files were not in the public Javadocs.)

Bug: 111925950
Test: make ds-docs
Exempt-From-Owner-Approval: Docs-only change
Change-Id: Ia06e1fffd814671289a1caebd5962aedc18a28d7
Merged-In: Ia06e1fffd814671289a1caebd5962aedc18a28d7
2018-10-04 18:20:51 +00:00
Andrew Solovay
5c05dedda1 cherry-pick from pi-dev docs: Replacing {#link with {@link
Several java files had the typo {#link (for cross-references to other
Javadocs) instead of the proper {@link format. This was confusing the
new doc publish tool (Mivi) since that's the format used for {# Django
comments #}.

Fixed a couple of links that had other errors (which prevented building
once the {# -> {@ was done) and other typos.

Replaced throughout the frameworks/base project; I'll need a separate CL
for the AndroidX fixes.

(Other files were not in the public Javadocs.)

Bug: 111925950
Test: make ds-docs
Change-Id: Ia06e1fffd814671289a1caebd5962aedc18a28d7
Original Change-Id: Ia06e1fffd814671289a1caebd5962aedc18a28d7
Exempt-From-Owner-Approval: Docs-only change
2018-10-04 18:17:05 +00:00
vnori
ac2c8a93f0 Merge "Add hidden API to return "Uploading" bit value from SDP record's MapSupportedFeatures." am: 51ec0ebbee am: 33c3ab90e0
am: 7eeb25c5fd

Change-Id: I4332451282d17e698e3f652e94f1b2463071e8a8
2018-09-25 16:47:37 -07:00
Vasu Nori
694752d5b9 Add hidden API to return "Uploading" bit value from SDP record's MapSupportedFeatures.
Bug: 111614861
Test: tested w/ KitchenSink App
Change-Id: I43895183d7b315f57257e1d2045f17dedcb0cfcd
2018-09-25 21:39:31 +00:00
Stanley Tng
ef31c4a72a Merge "Unhide the LE CoC APIs" am: 0677766615 am: ac723d7d62
am: af4189b8fa

Change-Id: I56f67e9e381c2ebe009405cf32bb78ed0ee50acd
2018-09-18 13:42:51 -07:00
Treehugger Robot
0677766615 Merge "Unhide the LE CoC APIs" 2018-09-18 18:31:26 +00:00
Mathew Inwood
8c854f86a4 Move some members to the "Q blacklist".
Based on some analysis, these fields/methods are likely false positives.
Set maxTargetSdk=P so that any apps using them are required to migrate off
them in future. See the bug for more details.

Exempted-From-Owner-Approval: Automatic changes to the codebase
affecting only @UnsupportedAppUsage annotations, themselves added
without requiring owners approval earlier.

Bug: 115609023
Test: m
Change-Id: I719b5c94e5b1f4fa562dd5d655953422958ad37e
2018-09-14 13:18:34 +01:00
Stanley Tng
1bff4bab9a Unhide the LE CoC APIs
Expose the LE Connection-oriented Channels APIs for applications to use.

Test: Run the SL4A ACTS test: BleCocTest
Bug: 70683224
Change-Id: I68128bc7154966ec065091c973351f8892da9b4d
2018-09-13 13:46:39 -07:00
Stanley Tng
009103c675 Add note for FLAG_CANCEL_CURRENT when stopping scan
Added a note in the Android API documentation for stopScan to make sure
that the flag FLAG_CANCEL_CURRENT is not used when creating the
PendingIntent parameter.

Bug: 77658091
Test: Just compile since not logic is changed
Change-Id: I55f33ae68679310ba4899708a2072a40fea0b3b4
(cherry picked from commit 20fc9a250e)
2018-09-12 10:55:54 -07:00