Commit Graph

832 Commits

Author SHA1 Message Date
Pavlin Radoslavov
798e1862bd Merge "Increase the character limit for "Use System Selection" message" am: a7ce460921
am: d0386d8c07

Change-Id: I34e41269fd5d47024e211daa4b5c48124e7db0a8
2017-01-26 23:46:49 +00:00
Pavlin Radoslavov
f8c776ce01 Increase the character limit for "Use System Selection" message
The character limit for message "Use System Selection (Default)"
has been increased from 40 to 50.

Test: UI visual inspection
Bug: 34662759
Change-Id: I9aba6847ddab27bb0456fb6dfd429692732f07c2
2017-01-26 13:37:14 -08:00
Pavlin Radoslavov
d364208388 Merge "Integration of the AAC codec for A2DP source" am: 22f97c83fb
am: f23e80bb9b

Change-Id: If2d85eba17f7ece5b3d19e3ee8fc86b7cf9bc062
2017-01-26 19:25:37 +00:00
Pavlin Radoslavov
b33bd5bc2e Integration of the AAC codec for A2DP source
Test: A2DP streaming to AAC headsets
Bug: 30958229
Change-Id: I1b530f1c5c495b8231fd68bed788d4567096683d
2017-01-26 09:06:02 -08:00
Pavlin Radoslavov
e667f7795f Merge "Fix wording ambiguity for Bluetooth LDAC Playback Quality selection" am: 0645c21163
am: b3f1eaa504

Change-Id: Ie1f0e958b93bfb898a7fdbe3ed8f732190a3e7ac
2017-01-26 04:34:57 +00:00
Pavlin Radoslavov
79fdc5001d Fix wording ambiguity for Bluetooth LDAC Playback Quality selection
"Optimize for" -> "Optimized for"

Bug: 34687041
Test: UI Visual inspection
Change-Id: I112ed6451465750978181e6ee35f96fd76969e9c
2017-01-25 22:19:17 +00:00
Pavlin Radoslavov
14e9d1c33f Merge "Update/cleanup Bluetooth Codec strings in Developer Settings" am: 5fd543ec34
am: fd2f4bbcca

Change-Id: I3c253b5ee444f23fc81dc607dcc85e95b2aa3226
2017-01-18 20:30:44 +00:00
Tamas Berghammer
24d8553316 DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
This reverts commit cbd3f0c59a.

Change-Id: I6e8d193fa22e0e7e30b214c13ae0480d3c9b0dc6
2017-01-18 19:33:22 +00:00
Pavlin Radoslavov
0e038dec6f Update/cleanup Bluetooth Codec strings in Developer Settings
Misc. fixes and cleanup related to the Bluetooth Codec strings
in Developer Settings:

 * Update the codec name "aptX-HD" -> "aptX HD" to reflect the vendor
   defined writing:
   https://www.aptx.com/aptx-hd
 * Increase some of the "CHAR LIMIT" values for the purpose
   of translation to other languages
 * Update some of the text in the UI (for clarity)
 * Added new string: "Streaming: " that is used in the UI summary

Test: UI visual observation
Bug: b/34188102 b/34206536 b/34209576 b/34210861 b/34207126 b/34211204
Bug: b/34206992 b/34210910 b/34210162 b/34205434 b/34198432 b/34186749
Bug: b/34188141 b/34188657 b/34192932 b/34188655
Change-Id: I9dc609594864b5d29394c49e0bce64416706c81c
2017-01-18 19:03:44 +00:00
Tamas Berghammer
cbd3f0c59a Update package names to work with the proto3 compiler
Bug: b/28974522
Change-Id: I5f3adf4946ee4ba1e09e4f40afe83c151405972a
(cherry picked from commit 383db5ebcc)
2017-01-11 11:27:38 +00:00
Pavlin Radoslavov
8905569c67 Merge "Add Bluetooth Codec selection UI to the Developer Options" am: bfd7f9a1f8
am: d190040dd1

Change-Id: I051932a98729e91f4e6512c9fa84a7e261b8cd96
2017-01-07 01:29:44 +00:00
Pavlin Radoslavov
60d704f841 Add Bluetooth Codec selection UI to the Developer Options
Test: A2DP streaming to headsets and manual UI interaction
Bug: 30958229
Change-Id: I88f6efedf1c89b524c863543135ef7be9b7e1a7c
2017-01-06 15:44:27 -08:00
Shinji Sogo
80fba49386 Merge "[HS2.0] Need to compare with not only FQDN but SSID" am: 69e7f9683d
am: e67395a97a

Change-Id: Idff19dcb2c95c4f8b359863fe8545fc478040723
2016-12-15 23:04:21 +00:00
Treehugger Robot
69e7f9683d Merge "[HS2.0] Need to compare with not only FQDN but SSID" 2016-12-15 22:17:48 +00:00
Bill Yi
18935bdfc9 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 32177112
Change-Id: I102b129ace5c7d97a6874aad995930b2f3cbdae6
2016-11-20 15:43:22 -08:00
Pavlin Radoslavov
ffb6a4beab Merge "Don't disconnect an A2DP device when connecting to same device" am: 3ebcf1218b
am: c15cc348e8

Change-Id: I0754321d2e289b4c6d2d64a00d13a2d9c2bfcf1c
2016-11-17 07:16:13 +00:00
Pavlin Radoslavov
c15cc348e8 Merge "Don't disconnect an A2DP device when connecting to same device"
am: 3ebcf1218b

Change-Id: Ibbf94535642bbde6e35ee1dacbd27dd13f400f16
2016-11-17 07:07:20 +00:00
Pavlin Radoslavov
eb067ba741 Don't disconnect an A2DP device when connecting to same device
When processing a connect request for an A2DP device, Settings
would trigger a disconnect request for all A2DP devices that
have state of CONNECTED, CONNECTING or DISCONNECTING, including
eventually the device we are connecting to.
This could create timing-related issues, and is not necessary.
Now we explicitly check to avoid disconnecting the device we are
connecting to.

Test: Manual A2DP testing with a phone and wireless headsets
Bug: 32688022
Change-Id: I572dd87c071829b734513c4b928a4d65fe539520
2016-11-17 05:29:08 +00:00
Joseph Pirozzo
1c21f0378a Pbap disconnect durring connect am: a4f0127fbb
am: a31933abc3

Change-Id: I73772d90dea4b9f3f70daef1b7b6ce44cfafb0e5
2016-11-02 01:10:02 +00:00
Joseph Pirozzo
c412914520 MAP MCE am: 631768d814
am: d94c280a7f

Change-Id: I6a765b9a07204afca2763fb98fdb2e92e08292e5
2016-11-02 01:09:14 +00:00
Joseph Pirozzo
a31933abc3 Pbap disconnect durring connect
am: a4f0127fbb

Change-Id: Ib2f65418dee82893a377b780647d823cfa274dd6
2016-11-02 01:04:33 +00:00
Joseph Pirozzo
d94c280a7f MAP MCE
am: 631768d814

Change-Id: I155fd0e8b44539bf79cec2c6ddb2a4d71b0c23d9
2016-11-02 01:03:51 +00:00
Joseph Pirozzo
a4f0127fbb Pbap disconnect durring connect
Durring a connect call disconnect from all other pbap devices rather
than from the device you are trying to connect to.

bug: 28406739
Change-Id: Ic0b651f32a0da18950fbc190b1d4503d69ebd203
(cherry picked from commit bdd24942e47811ffe6bb9814934e6b08a8190e7e)
2016-11-01 17:39:16 -07:00
Joseph Pirozzo
631768d814 MAP MCE
Add MAP client code into packages/apps/Bluetooth.  Changes here are to
define the MAP MCE interface and enable its selection when running on a
device that is also running a PBAP client (Car Kitt).

Bug: 30467210
Change-Id: Ifa2cdea7d67f63a2b5f3d971df8ec6d321dc5fee
(cherry picked from commit 433b3054847951e8e7b3864d11990604a66b8651)
2016-11-01 17:39:16 -07:00
Shinji Sogo
f29e122178 [HS2.0] Need to compare with not only FQDN but SSID
When there are APs with different SSID but the same
Passpoint configuration, connection status is shown for
the multiple APs though actually a device can be connected
to only one AP.

Bug:32136285

Change-Id: Iec5e5d1deb45aad68827500c23213ec7a8342229
2016-10-31 10:10:42 +01:00
Yoshinori Hirano
0be36ac0d1 Merge "Allow operator/manufacturer setting to use priority" am: aef1a557aa
am: 4244d53c3e

Change-Id: Ia6fcaa0550f2e1bb74f61d547fcd39de3b95fe90
2016-10-24 18:39:22 +00:00
Yoshinori Hirano
4244d53c3e Merge "Allow operator/manufacturer setting to use priority"
am: aef1a557aa

Change-Id: I81ccdc0910ab5298d5b54f3b8e390262d02225ea
2016-10-24 18:32:14 +00:00
Treehugger Robot
aef1a557aa Merge "Allow operator/manufacturer setting to use priority" 2016-10-24 18:21:07 +00:00
Matthew Fritze
6adcb1b33a Default for sending package name to support should be false am: b68a83a8eb
am: 4d9085f1d2

Change-Id: I10fb181b9aebc66bbbcaa646618f26ca84dfe552
2016-10-20 21:35:14 +00:00
Matthew Fritze
4d9085f1d2 Default for sending package name to support should be false
am: b68a83a8eb

Change-Id: Ic30a1508a9f7a8b1592778fc7eaa44692e99e579
2016-10-20 21:16:20 +00:00
Matthew Fritze
b68a83a8eb Default for sending package name to support should be false
Change-Id: I2cc90cac2c2c72f9febb015487f8854ebf006aac
Fixes: 32303343
Test: manual
2016-10-20 11:24:54 -07:00
Fan Zhang
383fd2e9b6 Catch NPE on network state and fall back to empty summary. am: 6acb76621d
am: d856752ee7

Change-Id: Id1f17b2d60627110c1c7a3ae9aac3a7496f534f1
2016-10-18 21:44:31 +00:00
Fan Zhang
d856752ee7 Catch NPE on network state and fall back to empty summary.
am: 6acb76621d

Change-Id: I208a614e1a29c0d0e523d712ea184ee87fc04254
2016-10-18 21:37:30 +00:00
TreeHugger Robot
964874e444 Merge "Catch NPE on network state and fall back to empty summary." into nyc-mr1-dev 2016-10-18 21:27:47 +00:00
Fan Zhang
6acb76621d Catch NPE on network state and fall back to empty summary.
Bug: 32171456
Change-Id: Ia3c1e1f5b7848ec914be9f92401a02b50df1dc57
2016-10-17 12:40:03 -07:00
Bill Yi
c11e301ca4 Import translations. DO NOT MERGE
Change-Id: I8ed7b626ec4169f9154a18daffe36160b8f3dacb
Auto-generated-cl: translation import
2016-10-17 11:08:03 -07:00
Jakub Pawlowski
414c77ce1c Merge "Fix Bluetooth OOB pairing not working for unseen devices" am: 3ef0315eb7 am: bd1a923cac
am: 08109a61d2

Change-Id: Id97645d7026466771a011ba787dce9866dc029d2
2016-10-14 14:38:10 +00:00
Shinji Sogo
dafb19bb59 Merge "Don't compare FQDN with providerFriendlyName" am: aae64557e1 am: 9c84160545
am: b8bab1df10

Change-Id: Ic019a0f04737d128cc5005be8fe9733f30ee44a3
2016-10-14 14:26:32 +00:00
Jakub Pawlowski
08109a61d2 Merge "Fix Bluetooth OOB pairing not working for unseen devices" am: 3ef0315eb7
am: bd1a923cac

Change-Id: I378f55d65663a1628ca53c1e2a63b850aac94845
2016-10-14 01:42:10 +00:00
Treehugger Robot
3ef0315eb7 Merge "Fix Bluetooth OOB pairing not working for unseen devices" 2016-10-14 01:25:11 +00:00
Bill Yi
ade9e011a8 Import translations. DO NOT MERGE
Change-Id: I825794cb543e17e2a5d2444c15a1dfdbdb048e23
Auto-generated-cl: translation import
2016-10-13 14:58:39 -07:00
Shinji Sogo
b8bab1df10 Merge "Don't compare FQDN with providerFriendlyName" am: aae64557e1
am: 9c84160545

Change-Id: I9091af58eb06d5bf89847ac35aba9849e5e758cf
2016-10-13 14:27:05 +00:00
Treehugger Robot
aae64557e1 Merge "Don't compare FQDN with providerFriendlyName" 2016-10-12 15:44:35 +00:00
Nick Kralevich
34547a8dc2 Delete "Show CPU usage" am: fc4a5c2d85
am: f0c0188a8a

Change-Id: If33e6687d3ec83904ab6ddbeb008c7b9c8130e7a
2016-10-11 18:15:23 +00:00
Nick Kralevich
f0c0188a8a Delete "Show CPU usage"
am: fc4a5c2d85

Change-Id: I4da784d136601fb3458b8697a0a27a232cd89111
2016-10-11 18:09:10 +00:00
Nick Kralevich
ab7a44b41a Merge "Delete "Show CPU usage"" into nyc-mr1-dev 2016-10-11 18:03:29 +00:00
Nick Kralevich
fc4a5c2d85 Delete "Show CPU usage"
This functionality hasn't worked since Lollipop.

Bug: 21388590
Change-Id: Ie4388d88f6e06f3e2d2e84e9c4515b3ebc6a0ea5
2016-10-11 09:01:38 -07:00
Jakub Pawlowski
3eb490f903 Fix Bluetooth OOB pairing not working for unseen devices
When Out Of Band info is provided, first time we learn about
device is when it's state is changed to "Bonding". This currently cause
this event to be discarded and pairing fails. Instead, we should add
CachedDevice object for newly added device.

Bug: 30188629
Change-Id: I4046bfe30e8bf32b888f608ac06d5041e2999dc9
2016-10-10 22:37:36 +00:00
Bill Yi
23c4362dac Import translations. DO NOT MERGE
Change-Id: I00d5ccf364c1b124e586148a139779a94cfafbf4
Auto-generated-cl: translation import
2016-10-10 11:30:39 -07:00
Jakub Pawlowski
4984d66b6a Merge "Fix connecting to profiles when bonding from local device (1/3)" am: 44c013d739 am: 6fe3900791
am: 56757a44a6

Change-Id: I3bdacc816923d012f061e5310d5e076fcaf9d387
2016-10-06 21:12:06 +00:00