Lucas Dupin
bc3a3df807
Merge "Do not filter out some colors" into oc-mr1-dev am: a9774680f8
...
am: 69bb2bae90
2017-08-17 01:03:22 +00:00
Kevin Hufnagle
be25fc4240
Merge "docs: Updated ShortcutManager API reference guide." into oc-dev am: 80376a98a5 am: d6d6d2cf79 am: 9c43a77971
...
am: 817b77489c
2017-08-17 00:49:26 +00:00
Bryce Lee
a7ec0565c6
Merge "Update references to O MR1 to proper codename." into oc-mr1-dev am: 92a84efba1
...
am: a0cc0c5c90
2017-08-17 00:39:20 +00:00
TreeHugger Robot
abe61c2a47
Merge "Add deltaX/Y to a11y scroll events"
2017-08-16 23:33:09 +00:00
Todd Kennedy
519b589300
resolve merge conflicts of d22603ebd2 to master
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Iab4443f6a8b996ea9f28f4e68c6ec3bb708526e6
2017-08-16 15:00:20 -07:00
Lucas Dupin
69bb2bae90
Merge "Do not filter out some colors" into oc-mr1-dev
...
am: a9774680f8
2017-08-16 19:52:34 +00:00
TreeHugger Robot
a9774680f8
Merge "Do not filter out some colors" into oc-mr1-dev
2017-08-16 19:38:45 +00:00
Kevin Hufnagle
817b77489c
Merge "docs: Updated ShortcutManager API reference guide." into oc-dev am: 80376a98a5 am: d6d6d2cf79
...
am: 9c43a77971
2017-08-16 19:26:45 +00:00
Hugo Benichi
b5c5b9d36c
Merge "Merge "Add convenience methods to IpPrefix and LinkAddress" am: 2ad60c88f1 am: ea2defe62b am: 4d7787a310 am: e9291de0c4" into oc-mr1-dev-plus-aosp
...
am: 4351aecb2d
2017-08-16 19:22:46 +00:00
Kevin Hufnagle
9c43a77971
Merge "docs: Updated ShortcutManager API reference guide." into oc-dev am: 80376a98a5
...
am: d6d6d2cf79
2017-08-16 19:16:10 +00:00
Kevin Hufnagle
d6d6d2cf79
Merge "docs: Updated ShortcutManager API reference guide." into oc-dev
...
am: 80376a98a5
2017-08-16 19:01:36 +00:00
Kevin Hufnagle
80376a98a5
Merge "docs: Updated ShortcutManager API reference guide." into oc-dev
2017-08-16 18:44:34 +00:00
Hugo Benichi
aef8a96dcd
Merge "More OWNERS file for core networking team" am: 2827f21740 am: 1da7985327 am: 63fdcd08f8 am: 1ada5660ce
...
am: d79f39689e
2017-08-16 18:43:48 +00:00
Hugo Benichi
337f94ffcf
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" am: b35719a057 am: 2f9fd9df23 am: f2ac860b7c am: cd7393c641
...
am: d1e7fc23ae
2017-08-16 18:39:54 +00:00
Benjamin Miller
1bb5a1e5b3
Merge "Docs: Javadoc comment fixups for secure passcode reset methods." into oc-mr1-dev am: 947528607f
...
am: 96d506af85
2017-08-16 18:29:38 +00:00
Bryce Lee
a0cc0c5c90
Merge "Update references to O MR1 to proper codename." into oc-mr1-dev
...
am: 92a84efba1
2017-08-16 17:57:23 +00:00
Todd Kennedy
cab962b8d0
Merge "Allow explicit permission denial" into oc-mr1-dev
...
am: 7fc53a11f8
2017-08-16 17:41:38 +00:00
Bryce Lee
92a84efba1
Merge "Update references to O MR1 to proper codename." into oc-mr1-dev
2017-08-16 17:30:43 +00:00
TreeHugger Robot
7fc53a11f8
Merge "Allow explicit permission denial" into oc-mr1-dev
2017-08-16 17:11:30 +00:00
Felipe Leme
749be66178
Merge "Calls CancellationSignal when onFillRequest() times out." into oc-mr1-dev am: 6ba128762f
...
am: 486ecbe517
2017-08-16 16:38:18 +00:00
Hugo Benichi
202cc407c2
Merge "Add convenience methods to IpPrefix and LinkAddress" am: 2ad60c88f1 am: ea2defe62b am: 4d7787a310
...
am: e9291de0c4
2017-08-16 15:20:59 +00:00
Hugo Benichi
e9291de0c4
Merge "Add convenience methods to IpPrefix and LinkAddress" am: 2ad60c88f1 am: ea2defe62b
...
am: 4d7787a310
2017-08-16 15:09:12 +00:00
Hugo Benichi
4d7787a310
Merge "Add convenience methods to IpPrefix and LinkAddress" am: 2ad60c88f1
...
am: ea2defe62b
2017-08-16 14:56:51 +00:00
Hugo Benichi
ea2defe62b
Merge "Add convenience methods to IpPrefix and LinkAddress"
...
am: 2ad60c88f1
2017-08-16 14:49:27 +00:00
Todd Kennedy
74629e3183
Allow explicit permission denial
...
Change-Id: I5d348ed555f249d210253dab60ae11d4831c4f0a
Fixes: 63675512
Test: Manual
2017-08-16 14:43:05 +00:00
Treehugger Robot
2ad60c88f1
Merge "Add convenience methods to IpPrefix and LinkAddress"
2017-08-16 14:38:29 +00:00
TreeHugger Robot
6fc20cbffb
Merge "thermalservice: future-proofing fixup to Temperature constructor"
2017-08-16 14:26:28 +00:00
Hugo Benichi
1dfb6b6755
Add convenience methods to IpPrefix and LinkAddress
...
Also moving relevant test files into tests/net as part of runtest
framworks-net.
Also removes testHashCode in LinkAddress() because this test relies on
the assumption that hashCode() is stable across releases or jdk
versions, which is absolutely not true.
This creates maintenance work for little benefit since hashCode is
already tested as part of the equality test.
For instance this test is now broken because hashing for InetAddress
changed.
Bug: 62988545
Bug: 62918393
Test: runtest frameworks-net, added coverage in tests
Change-Id: I695bc3f0e801bf13bc4fc0706565758f12b775b4
2017-08-16 21:42:21 +09:00
Hugo Benichi
d79f39689e
Merge "More OWNERS file for core networking team" am: 2827f21740 am: 1da7985327 am: 63fdcd08f8
...
am: 1ada5660ce
2017-08-16 12:32:51 +00:00
Hugo Benichi
d1e7fc23ae
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" am: b35719a057 am: 2f9fd9df23 am: f2ac860b7c
...
am: cd7393c641
2017-08-16 12:23:25 +00:00
Hugo Benichi
1ada5660ce
Merge "More OWNERS file for core networking team" am: 2827f21740 am: 1da7985327
...
am: 63fdcd08f8
2017-08-16 12:23:15 +00:00
Hugo Benichi
cd7393c641
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" am: b35719a057 am: 2f9fd9df23
...
am: f2ac860b7c
2017-08-16 12:14:09 +00:00
Hugo Benichi
63fdcd08f8
Merge "More OWNERS file for core networking team" am: 2827f21740
...
am: 1da7985327
2017-08-16 12:10:19 +00:00
Hugo Benichi
f2ac860b7c
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" am: b35719a057
...
am: 2f9fd9df23
2017-08-16 12:04:38 +00:00
Hugo Benichi
1da7985327
Merge "More OWNERS file for core networking team"
...
am: 2827f21740
2017-08-16 11:57:50 +00:00
Hugo Benichi
2f9fd9df23
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities"
...
am: b35719a057
2017-08-16 11:50:55 +00:00
Treehugger Robot
2827f21740
Merge "More OWNERS file for core networking team"
2017-08-16 11:37:11 +00:00
Treehugger Robot
b35719a057
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities"
2017-08-16 11:34:24 +00:00
Benjamin Miller
96d506af85
Merge "Docs: Javadoc comment fixups for secure passcode reset methods." into oc-mr1-dev
...
am: 947528607f
2017-08-16 10:19:34 +00:00
TreeHugger Robot
947528607f
Merge "Docs: Javadoc comment fixups for secure passcode reset methods." into oc-mr1-dev
2017-08-16 10:13:09 +00:00
TreeHugger Robot
63c59937d7
Merge "Load Smart Select stroke color from colorControlActivated"
2017-08-16 10:01:05 +00:00
Hugo Benichi
b8f1e4e6e4
More OWNERS file for core networking team
...
Test: build
Change-Id: I7cef188e29f487025aee04ab0c1a003bb32a7048
2017-08-16 18:40:07 +09:00
Hugo Benichi
bae105a5cc
Allow NetworkAgent "immutable updates" to NetworkCapabilities
...
This patch loosens the validation checks when a NetworkAgent updates it
NetworkCapabilities: instead of checking that capabilities labeled as
"immutable" stay identical across updates, it is now accepted to change
immutable capabilities in a way that the new NetworkCapabilities
satisfies the old NetworkCapabilities.
This allows a NetworkAgent to update itself in order to match more
requests, but will still catch NetworkAgents that sends degradation
updates causing potentially requests to not match anymore.
Bug: 64125969
Test: runtest frameworks-net
Change-Id: I2a1b3f9c0be6415e40edc989d0c1b03b5631f7b1
2017-08-16 18:30:30 +09:00
Todd Poynor
6d5ce9e234
thermalservice: future-proofing fixup to Temperature constructor
...
Change the default constructor to leverage the constructor with params
specified, to avoid future code duplication if more logic is added to
constructors in the future.
Test: manual: marlin with temporary java thermal event listener
Bug: 30982366
Change-Id: I0be55fe2561f606ddf1bcebb98ae7e1120ff8d2d
2017-08-16 08:01:12 +00:00
Felipe Leme
486ecbe517
Merge "Calls CancellationSignal when onFillRequest() times out." into oc-mr1-dev
...
am: 6ba128762f
2017-08-15 22:49:15 +00:00
Felipe Leme
eb6a0c2560
Merge "Merge "Additional documentation about Autofill / WebView security." into oc-dev am: 36cbdef880 am: 7e9f379b50 am: 82e7dfcae8" into oc-mr1-dev-plus-aosp
...
am: 11435f8153
2017-08-15 22:42:54 +00:00
TreeHugger Robot
6ba128762f
Merge "Calls CancellationSignal when onFillRequest() times out." into oc-mr1-dev
2017-08-15 22:23:57 +00:00
Charles He
2a9b5933fc
Merge "Merge "[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4 am: 159cd14334 am: 24587d57cf am: 0fa9328b80 am: 51ca967453" into oc-dr1-dev-plus-aosp am: 5ee440bbcc" into oc-mr1-dev-plus-aosp
...
am: 417557193c
2017-08-15 22:23:55 +00:00
Felipe Leme
262966aad1
Merge "Additional documentation about Autofill / WebView security." into oc-dev am: 36cbdef880 am: 7e9f379b50
...
am: 82e7dfcae8
2017-08-15 22:13:39 +00:00
Charles He
ec7018fad5
Merge "[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4 am: 159cd14334 am: 24587d57cf am: 0fa9328b80 am: 51ca967453" into oc-dr1-dev-plus-aosp
...
am: 5ee440bbcc
2017-08-15 21:55:17 +00:00
