Jakub Pawlowski
f68a0c6dec
Merge "Add helper method to convert Bluetooth UUID to bytes" am: 8a0a58b218
...
am: f169ecb76f
2016-10-25 21:54:44 +00:00
Jakub Pawlowski
f169ecb76f
Merge "Add helper method to convert Bluetooth UUID to bytes"
...
am: 8a0a58b218
2016-10-25 21:47:35 +00:00
Jakub Pawlowski
f67ee83a22
Add helper method to convert Bluetooth UUID to bytes
...
Bug: 30622771
Test: sl4a ConcurrentBleAdvertisingTest
Change-Id: I7f646d1d357c51b82efc504a0e65d868ad363ddb
2016-10-25 12:30:24 -07:00
Robert Sesek
aa544e975e
Merge "Create the WebViewZygote and implement WebViewZygoteInit." am: 8be2850546
...
am: f80fab010a
2016-10-22 03:17:15 +00:00
Robert Sesek
f80fab010a
Merge "Create the WebViewZygote and implement WebViewZygoteInit."
...
am: 8be2850546
2016-10-22 03:12:18 +00:00
Treehugger Robot
8be2850546
Merge "Create the WebViewZygote and implement WebViewZygoteInit."
2016-10-22 03:03:10 +00:00
Jeremy Joslin
807102d7ff
VPN network stat accounting changes. am: 3f0d75afe8
...
am: 0d309b7a47
2016-10-21 23:43:06 +00:00
Jeremy Joslin
0d309b7a47
VPN network stat accounting changes.
...
am: 3f0d75afe8
2016-10-21 23:37:57 +00:00
Yin-Chia Yeh
0eb99d23b4
Merge "Camera2 Legacy: catch more surface abandoned error" am: 03f14bef41
...
am: 50f9b6e71f
2016-10-21 21:18:48 +00:00
Vinod Krishnan
ccf3baf6c5
Fwk: Only chime when docked and accessbility is on
...
am: cf11ceab65
2016-10-21 21:14:19 +00:00
Yin-Chia Yeh
50f9b6e71f
Merge "Camera2 Legacy: catch more surface abandoned error"
...
am: 03f14bef41
2016-10-21 21:07:44 +00:00
TreeHugger Robot
088f73a9e9
Merge "Fwk: Only chime when docked and accessbility is on" into cw-f-dev
2016-10-21 20:41:10 +00:00
Yin-Chia Yeh
091661334b
Camera2 Legacy: catch more surface abandoned error
...
Bug: 30140107
Change-Id: Ia293bdbb85c8078e17def55db9c599cfe70458db
2016-10-21 11:40:46 -07:00
Vinod Krishnan
cf11ceab65
Fwk: Only chime when docked and accessbility is on
...
Bug: 32036947
Change-Id: I5786abe827735cc3a4bc1d52baacaa19bccaae77
2016-10-21 10:28:37 -07:00
Jeremy Joslin
3f0d75afe8
VPN network stat accounting changes.
...
Properly account for VPN apps that make heavy use of the tun
interface. Prior to this change a VPN app could be incorrectly charged
for more data than it actually used if it sent more traffic through
the tun interface than the underlying interface.
This change excludes VPN app traffic on the tun interface from the
adjustment pool and doesn't redistribute traffic to the VPN app.
Instead all of the redistributed traffic is deducted from the VPN app
which effectively represents any overhead incurred by the VPN app.
BUG: 30557871
Change-Id: I62a75a0c0c0111e052b7903baa9f5d6d94ef57fd
2016-10-21 18:47:57 +09:00
Jacky Cheung
bd12e5c9db
Merge "Gradually increase the level of authentication on failed GATT operations." am: 6071abdb92
...
am: 046a5c3a00
2016-10-20 23:11:51 +00:00
Jacky Cheung
046a5c3a00
Merge "Gradually increase the level of authentication on failed GATT operations."
...
am: 6071abdb92
2016-10-20 23:03:57 +00:00
Jacky Cheung
3854e22674
Gradually increase the level of authentication on failed GATT operations.
...
When lower layer returns insufficient authentication or insufficient
encryption on various GATT operations, gradually retry with increased
authentication level first to AUTHENTICATION_NO_MITM, then
AUTHENTICATION_MITM.
Test: ported from internal branch.
Change-Id: I6bcc4198ca493b7900ddd166a81d30cde896fa86
2016-10-20 13:59:04 -07:00
Jacky Cheung
8167362bab
Merge "Gradually increase the level of authentication on failed GATT operations." into cw-f-dev
2016-10-20 20:42:09 +00:00
Calvin On
4a048f9964
Add option to skip and avoid captive portals.
...
am: 4bc78eba6f
2016-10-20 20:18:10 +00:00
Calvin On
4bc78eba6f
Add option to skip and avoid captive portals.
...
Test: ConnectivityServiceTest updated with test cases.
Test: Manually tested against att-wifi in B42.
Bug: 30222699
Change-Id: Ibe63942da04748ab0406e24e0f44be31d47710a0
(cherry picked from commit be96da11cc
2016-10-20 18:50:46 +00:00
Jacky Cheung
84c6d339ee
Gradually increase the level of authentication on failed GATT operations.
...
When lower layer returns insufficient authentication or insufficient
encryption on various GATT operations, gradually retry with increased
authentication level first to AUTHENTICATION_NO_MITM, then
AUTHENTICATION_MITM.
Change-Id: I68335cf7451aeaf49c227d604f69cb329d117d08
2016-10-20 18:17:12 +00:00
Kevin Hufnagle
cc93c4d247
docs: Updated ShortcutManager and ShortcutInfo class references. am: 68d699d100
...
am: 38138600d2
2016-10-20 00:02:14 +00:00
Kevin Hufnagle
38138600d2
docs: Updated ShortcutManager and ShortcutInfo class references.
...
am: 68d699d100
2016-10-19 23:53:36 +00:00
Kevin Hufnagle
fee89015c5
Merge "docs: Updated ShortcutManager and ShortcutInfo class references." into nyc-mr1-dev
2016-10-19 23:43:52 +00:00
Andreas Huber
599d51393c
Merge "HIDL Vectors are now exposed to Java as ArrayList<T>, the supporting APIs on" am: 2202b164d8
...
am: abfd527d09
2016-10-19 19:45:54 +00:00
Christopher Wiley
31ac117bef
Merge "Use this.isUp() inside InterfaceConfiguration" am: 239df3cc5a
...
am: c6e72b30c7
2016-10-19 19:39:13 +00:00
Andreas Huber
abfd527d09
Merge "HIDL Vectors are now exposed to Java as ArrayList<T>, the supporting APIs on"
...
am: 2202b164d8
2016-10-19 19:39:03 +00:00
Christopher Wiley
c6e72b30c7
Merge "Use this.isUp() inside InterfaceConfiguration"
...
am: 239df3cc5a
2016-10-19 19:31:57 +00:00
Andreas Huber
2202b164d8
Merge "HIDL Vectors are now exposed to Java as ArrayList<T>, the supporting APIs on"
2016-10-19 19:30:29 +00:00
Treehugger Robot
239df3cc5a
Merge "Use this.isUp() inside InterfaceConfiguration"
2016-10-19 19:15:31 +00:00
Marie Janssen
849174f228
Bluetooth: More logging of bluetooth service state am: 9fa2491850
...
am: d8e027b5a4
2016-10-19 16:49:23 +00:00
Marie Janssen
d8e027b5a4
Bluetooth: More logging of bluetooth service state
...
am: 9fa2491850
2016-10-19 16:43:09 +00:00
Marie Janssen
9fa2491850
Bluetooth: More logging of bluetooth service state
...
Bug: 32140251
Bug: 32140271
Bug: 32060415
Change-Id: I50faa184551748023ea5a573646a75293f553d16
2016-10-19 16:28:31 +00:00
Adam Lesinski
cc903f425a
Fix regression with defaultDisplay adjustments am: f02523bf4b
...
am: be75a58447
2016-10-18 23:03:51 +00:00
Adam Lesinski
be75a58447
Fix regression with defaultDisplay adjustments
...
am: f02523bf4b
2016-10-18 22:55:14 +00:00
Kevin Hufnagle
68d699d100
docs: Updated ShortcutManager and ShortcutInfo class references.
...
Bug: 32074598
Change-Id: I168d49a8542b411a074dc6e9120b0f08f72a829a
2016-10-18 15:53:09 -07:00
Adam Lesinski
f02523bf4b
Fix regression with defaultDisplay adjustments
...
ag/1542219 introduced a regression where if the display was the default
display, the configuration would still be adjusted as if it were
a non-default display. This fixes that logic to only adjust the
configuration if the display is non-default.
Bug:32133693
Test: cts-tradefed run cts --module CtsServicesHostTestCases --test android.server.cts.ActivityManagerAppConfigurationTests#testConfigurationUpdatesWhenRotatingToSideFromDocked
Change-Id: Ib2fda8c1651609efa9d20b3e2dace8a122864916
2016-10-18 20:13:57 +00:00
Bryce Lee
ccd3468567
resolve merge conflicts of b1301fa to nyc-mr1-dev-plus-aosp
...
Change-Id: Idb97adf36d981a340cdb5d24d4c3c3858d23e2fe
2016-10-18 10:07:00 -07:00
Andreas Huber
ef1a565bd4
HIDL Vectors are now exposed to Java as ArrayList<T>, the supporting APIs on
...
HwParcel now reflect this change.
Bug: 32237331
Test: hidl_test_java
Change-Id: Ia1ce5a4e3acedd8ebcff15107aea53ce28fde589
2016-10-18 09:36:02 -07:00
Bryce Lee
112ae34fea
Merge "Add a way to query for supported Bluetooth profiles." into cw-f-dev
2016-10-18 16:32:52 +00:00
Sanket Agarwal
933c625a92
Merge "Remove APIs that are not directly usable." am: 9cff57312d
...
am: 086be31642
2016-10-17 21:32:21 +00:00
Sanket Agarwal
086be31642
Merge "Remove APIs that are not directly usable."
...
am: 9cff57312d
2016-10-17 21:28:05 +00:00
Sanket Agarwal
fb6322425a
Remove APIs that are not directly usable.
...
The right way to expose this API is done via MediaBrowser.
Bug: b/28791287
Change-Id: I0a8a185934fd7aaa9f2b5eac7398955fa380060f
(cherry picked from commit b5fbb75aa2
2016-10-17 12:47:10 -07:00
Christopher Wiley
87100cce39
Use this.isUp() inside InterfaceConfiguration
...
Bug: 31337216
Test: Compiles
Change-Id: I968a739f9ada47b1357932d2da76451eb26c3d5f
2016-10-17 10:32:40 -07:00
Christopher Wiley
39c3166710
Merge "Add InterfaceConfiguration.isUp()" am: c7ea99a63c
...
am: 281d7490bf
2016-10-17 16:45:35 +00:00
Christopher Wiley
281d7490bf
Merge "Add InterfaceConfiguration.isUp()"
...
am: c7ea99a63c
2016-10-17 16:41:52 +00:00
Adam Lesinski
d7ec1ea697
Update DisplayMetrics even on default display am: 4309721843
...
am: dab7950d80
2016-10-14 22:41:35 +00:00
Adam Lesinski
dab7950d80
Update DisplayMetrics even on default display
...
am: 4309721843
2016-10-14 22:34:06 +00:00
Adam Lesinski
4309721843
Update DisplayMetrics even on default display
...
Fix a bug where the DisplayMetrics wouldn't be updated for a Resources
object on the default display. Since multi-window, we want to update
all Resources.
This didn't always manifest itself due to recreation of assets, which
would force an update of DisplayMetrics. Re-use of an AssetManager from
the cache would expose the bug.
Bug:32133693
Bug:31998629
Test: cts-tradefed run cts --module CtsServicesHostTestCases
Change-Id: Ic51ab82710517b87eb995ccf982085dba876ad58
2016-10-14 18:16:18 +00:00
