Commit Graph

62105 Commits

Author SHA1 Message Date
Jakub Pawlowski
196fe3597c Merge "BLE OOB Pairing - parse address type (5/5)" am: 97d9fe0a2f am: c3cfff6ef6
am: f59ad8bd68

Change-Id: I8307894e80bdfc1c260708c7174d294178ffa00b
2016-11-10 20:24:10 +00:00
Jakub Pawlowski
f59ad8bd68 Merge "BLE OOB Pairing - parse address type (5/5)" am: 97d9fe0a2f
am: c3cfff6ef6

Change-Id: Ia05bccadc06b202cf6ac1039b1e227bd67575bb5
2016-11-10 20:14:24 +00:00
Jakub Pawlowski
c3cfff6ef6 Merge "BLE OOB Pairing - parse address type (5/5)"
am: 97d9fe0a2f

Change-Id: I935cc35d9f7f1eea5459f0091ad14dc8b200bc02
2016-11-10 20:07:39 +00:00
Jakub Pawlowski
f465823f6d BLE OOB Pairing - parse address type (5/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: Ie6cc1f8c008d43b2acd021b47f9bbfb1f63472e8
2016-11-10 19:51:49 +00:00
Erik Kline
d8a06fa28a Handle IpReachabilityMonitor errors better.
am: e452660466

Change-Id: I3bb9ce7caa99e166ddc576399453fcc9e172d6a6
2016-11-09 02:37:17 +00:00
Steven Moreland
97186e09ae Merge "Update for namespaced services in hwservicemanager." am: 605df82c9e am: 3dcee9882d
am: 1a384933df

Change-Id: I3ab231d9342ec1100866d3da2d752c70793cdcd8
2016-11-08 21:36:10 +00:00
Steven Moreland
1a384933df Merge "Update for namespaced services in hwservicemanager." am: 605df82c9e
am: 3dcee9882d

Change-Id: I929f34098061e084f1d9a92070179351c65d5acc
2016-11-08 21:29:31 +00:00
Steven Moreland
3dcee9882d Merge "Update for namespaced services in hwservicemanager."
am: 605df82c9e

Change-Id: I38d861ca107665f1f865f19eebd1be368a8c77a4
2016-11-08 21:20:57 +00:00
Steven Moreland
f3c53496c0 Update for namespaced services in hwservicemanager.
Test: end to end, hidl_test_java
Bug: 31861268
Change-Id: I3e91cf8a87f9345d4ae0650e521414407c7fc780
2016-11-08 08:53:16 -08:00
Erik Kline
e452660466 Handle IpReachabilityMonitor errors better.
If construction of a new IpReachabilityMonitor throws an IAE then
log it and immediately call onProvisioningFailure().

Test: runtest frameworks-wifi
      passes, except for selectQualifiedNetworkDoesNotChooseDeletedEphemeral()
      which fails with an NPE for unrelated reasons.

Bug: 31038971
Bug: 31742703
Change-Id: Ie91b8bdd509d06ad54d062bf446e74c092eb096c
2016-11-08 16:02:24 +09:00
Etan Cohen
2ad6b14d50 Merge "[NAN-AWARE] Rename NAN to Aware" am: 74b1131cc8 am: 6571007101
am: a99a05982e

Change-Id: I8df580e15770c54ab3f0da3e3ff97165939719df
2016-11-06 03:29:40 +00:00
Etan Cohen
a99a05982e Merge "[NAN-AWARE] Rename NAN to Aware" am: 74b1131cc8
am: 6571007101

Change-Id: Ief54b313dc5ca5d30645b55ed2ad0333036a1671
2016-11-06 03:21:37 +00:00
Etan Cohen
6571007101 Merge "[NAN-AWARE] Rename NAN to Aware"
am: 74b1131cc8

Change-Id: I2e788e19a11f2709f2e542dbdc4b58433a3574bf
2016-11-06 03:13:31 +00:00
Etan Cohen
0849ded008 [NAN-AWARE] Rename NAN to Aware
~Rename only (and any reformatting needed to pass lint) - no
functional changes!

Remove android.net.wifi.nan.STATE_CHANGED from manifest:
redundant/remnant of an older configuration.

(cherry-pick of commit a61b9fb569)

Bug: 32263750
Test: All unit tests and integration (sl4a) tests pass.
Merged-In: Ie4ff675fa61041e8fcf6a9bf9900ea835d0a7614
Change-Id: I4206d2fd722dc7dec9df4aee5c818101d7f9dccc
2016-11-05 09:41:38 -07:00
Phil Weaver
1b5e3d98d2 Revert "Don't invalidate list data during layout." am: 866ded50bb am: 96b4a68c06
am: b8a314427b

Change-Id: I5ace1c6b058b795a5b04e48200d2b3d3a1ae2486
2016-11-02 17:30:48 +00:00
Phil Weaver
96b4a68c06 Revert "Don't invalidate list data during layout."
am: 866ded50bb

Change-Id: I191c26bfb9488d5d67514a81387a9cde95a20eb4
2016-11-02 17:20:17 +00:00
Joseph Pirozzo
132dab26e5 MAP MCE am: b8fc0679e8 am: b13240028b
am: 5602b26f41

Change-Id: I54f67bbb44c3ecbdaa96b2f71d762bbb8bdce46c
2016-11-02 01:18:38 +00:00
Joseph Pirozzo
fb70d77f64 MAP MCE am: 631768d814 am: d94c280a7f
am: c412914520

Change-Id: Ia56d131194075795c55c899dfbebbe3c2feb1584
2016-11-02 01:16:45 +00:00
Joseph Pirozzo
5602b26f41 MAP MCE am: b8fc0679e8
am: b13240028b

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

Change-Id: I6a765b9a07204afca2763fb98fdb2e92e08292e5
2016-11-02 01:09:14 +00:00
Joseph Pirozzo
b13240028b MAP MCE
am: b8fc0679e8

Change-Id: Id82f047bc2d0eb7e4f04c14cfc216854e066156f
2016-11-02 01:05:14 +00:00
Joseph Pirozzo
d94c280a7f MAP MCE
am: 631768d814

Change-Id: I155fd0e8b44539bf79cec2c6ddb2a4d71b0c23d9
2016-11-02 01:03:51 +00:00
Tomasz Mikolajewski
d771ca3871 Merge "Add support for opening JAR/ZIP files via FD." am: 7f64c195f7 am: 4c65d49a92
am: de915e3ade

Change-Id: I625a398a8def68b8b8ef77f1408f5c6f8a85c1fa
2016-11-02 00:44:47 +00:00
Tomasz Mikolajewski
de915e3ade Merge "Add support for opening JAR/ZIP files via FD." am: 7f64c195f7
am: 4c65d49a92

Change-Id: I534e70f5218e0f9be73d919a4c9dd509211729f8
2016-11-02 00:39:45 +00:00
Joseph Pirozzo
b8fc0679e8 MAP MCE
Fix @LINK to @link in javadoc.

Bug: 30467210
Change-Id: Icac176947bee971c3f5d11fd4166cf8ceb0a437e
(cherry picked from commit f5fba751d360bbe8294c4640f5ad12a990f13122)
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
Tomasz Mikolajewski
4c65d49a92 Merge "Add support for opening JAR/ZIP files via FD."
am: 7f64c195f7

Change-Id: I88af6f42ccd5e6edafa57fd0f147f676da8aa096
2016-11-02 00:34:47 +00:00
Tomasz Mikolajewski
7f64c195f7 Merge "Add support for opening JAR/ZIP files via FD." 2016-11-02 00:24:07 +00:00
Phil Weaver
866ded50bb Revert "Don't invalidate list data during layout."
This reverts commit 456158ffc2.

Change-Id: I7a61dc34dfc81ee650ca0883fe99c0f5dc08ba75
2016-11-01 23:38:44 +00:00
Bryce Lee
6f84631d8d Merge "Add a way to query for supported Bluetooth profiles."
am: 0a86c936a6

Change-Id: Id10ad10a5dbcab92e390a7a245772d2b551ad30c
2016-11-01 23:20:16 +00:00
Phil Weaver
112345c1c3 Don't invalidate list data during layout. am: 456158ffc2 am: 06ffff6132
am: 07f434d02f

Change-Id: I6adaa881b70805d46d2425dd979609c6e99e11c9
2016-11-01 23:09:02 +00:00
Vinod Krishnan
166b0ad28f DO NOT MERGE Wear Fwk: Disable Animations for A11y am: 8500f26d51
am: 305187983b

Change-Id: Ifb4eea689ded623034d5f8aa3158c814620e9de9
2016-11-01 23:04:59 +00:00
Vinod Krishnan
305187983b DO NOT MERGE Wear Fwk: Disable Animations for A11y
am: 8500f26d51

Change-Id: I8bddbad4b8777a3fedac2f88717b48d00f596a8c
2016-11-01 22:57:58 +00:00
Phil Weaver
06ffff6132 Don't invalidate list data during layout.
am: 456158ffc2

Change-Id: I550b63d3fd6b5f451083627dc16f369729b1e1d7
2016-11-01 22:55:11 +00:00
vinodkrishnan
89e653ccc7 Merge "DO NOT MERGE Wear Fwk: Disable Animations for A11y" into cw-f-dev 2016-11-01 22:54:11 +00:00
Bryce Lee
f6b74dea04 Add a way to query for supported Bluetooth profiles.
Currently there is no way to get the profiles supported by the Bluetooth
adapter. Asking for a profile proxy of an unsupported profile does not
fail and can lead to code indefinitely waiting for the proxy response. This
new code will allow for checking the supported profiles before asking for
the proxies.

Bug: 26451648
Change-Id: I4b48e7151f5ca53851aa3b967c143fae140ecd34
(cherry picked from commit b1301fa284)
2016-11-01 15:13:04 -07:00
Phil Weaver
456158ffc2 Don't invalidate list data during layout.
When a FastScroller is enabled, we were invalidating the
list data during layout, which left the UI in a bad state.
Long-presses didn't work properly, and TalkBack touches
were impossible to perform.

Bug: 31160338

Test: Manually tested long pressing, and verified
that TalkBack now works with the TestActivity in ag/1567328.
Change-Id: Iecd2d597259748a3ecbf5573950e565a0e9faa42
2016-11-01 18:36:16 +00:00
Chet Haase
1d795210a6 Clean up InputConnection.commitContent() javadocs DO NOT MERGE am: 5c0af88764 am: b76d3363ed
am: e1dd52264b

Change-Id: I1868f4780becfdc74bad885d14e82c27acc83efa
2016-11-01 17:38:51 +00:00
Chet Haase
b76d3363ed Clean up InputConnection.commitContent() javadocs DO NOT MERGE
am: 5c0af88764

Change-Id: I1f0147cbac31a7e68bc89601e1952f5a35971885
2016-11-01 17:30:47 +00:00
Tomasz Mikolajewski
6c3df1543c Add support for opening JAR/ZIP files via FD.
Test: Upcoming change in DocumentsUI uses this feature.
Bug: 31783726
Change-Id: Ia74e9bdb66722dfb2855380375a99cc94d288b2e
(cherry picked from commit 5a5c44a2e3)
2016-11-01 09:25:59 +09:00
Chet Haase
5c0af88764 Clean up InputConnection.commitContent() javadocs DO NOT MERGE
Test: docs only, no test apart from verifying that it builds
Bug: #32158219 clean up InputConnection.commitContent() javadocs
Change-Id: I9b438d6b14aa8bc868fe41f7e0fe22b0e83800fb
2016-11-01 00:07:13 +00:00
Sanket Agarwal
502e3e53ec Merge "Configuration for priority/auto-connection for PAN." am: ba63f32ed5 am: 50cc13cc18
am: 9e33f453a3

Change-Id: I509fc113b64e7fac13ff666dd194a118b65b002c
2016-10-31 19:29:56 +00:00
Sanket Agarwal
9e33f453a3 Merge "Configuration for priority/auto-connection for PAN." am: ba63f32ed5
am: 50cc13cc18

Change-Id: I6725098623dba530db325f6b12d5193f9f2629e7
2016-10-31 19:25:34 +00:00
Sanket Agarwal
50cc13cc18 Merge "Configuration for priority/auto-connection for PAN."
am: ba63f32ed5

Change-Id: I00ecde6e7f1c64f704341c7a96e476f1a11bdaea
2016-10-31 19:19:30 +00:00
Marie Janssen
635d528877 resolve merge conflicts of 6a31a5c to stage-aosp-master
am: 879a5169ec

Change-Id: Ib6321dee7357920c73b135fbe465998dc4469e66
2016-10-31 18:47:52 +00:00
Marie Janssen
879a5169ec resolve merge conflicts of 6a31a5c to stage-aosp-master
Change-Id: I29f2085f4656b0b57896ef505ef6a50cdbd1b194
2016-10-31 11:00:06 -07:00
Sanket Agarwal
773297a83e Configuration for priority/auto-connection for PAN.
We protect the auto-connection via a flag so that it is only enabled on
some devices.

Bug: b/30679978
Change-Id: I5b7f273e09a659b561913d5c6f3a76feb245e6ce
(cherry picked from commit 1f09d5f255980488cabd55a5c44a5737e24541d8)
2016-10-31 17:45:32 +00:00
Marie Janssen
6a383a7d32 Bluetooth: prevent enabling BLE in airplane mode
Enabling BLE in airplane mode puts BluetoothManagerService in an
unexpected state which causes Bluetooth to be on when airplane mode
is disabled.

Also fixes a bug where a crash of a BLE client would trigger a restart
into ON mode.

Test: SL4A BleBackgroundScanTest:test_airplane_mode_disables_ble

Bug: 32140251
Bug: 32140271
Bug: 32369494

Change-Id: Ie65157e65c3a1ca914f567a7a0c631175d1e5835
2016-10-31 09:06:36 -07:00
Aga Madurska
5a5187edcd Update colors for the round scroll bar. am: 5177264735
am: c78b695126

Change-Id: Iffaab844f7c0fab11cc429f06b450eb190737bc5
2016-10-31 11:59:29 +00:00
Aga Madurska
5177264735 Update colors for the round scroll bar.
Bug:32536003

Change-Id: I35503c089bc918493aab3288580f81d7b780d671
2016-10-31 10:55:07 +00:00