Felipe Leme
e6be222bdf
Merge "Improved autofill support on DatePicker and TimePicker:" into oc-mr1-dev
...
am: 6598a4ed52
2017-08-16 22:51:52 +00:00
TreeHugger Robot
6598a4ed52
Merge "Improved autofill support on DatePicker and TimePicker:" into oc-mr1-dev
2017-08-16 22:10:46 +00: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
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
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
Bryce Lee
92a84efba1
Merge "Update references to O MR1 to proper codename." into oc-mr1-dev
2017-08-16 17:30:43 +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
Treehugger Robot
2ad60c88f1
Merge "Add convenience methods to IpPrefix and LinkAddress"
2017-08-16 14:38:29 +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
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
cd7393c641
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" am: b35719a057 am: 2f9fd9df23
...
am: f2ac860b7c
2017-08-16 12:14:09 +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
2f9fd9df23
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities"
...
am: b35719a057
2017-08-16 11:50:55 +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
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
Felipe Leme
486ecbe517
Merge "Calls CancellationSignal when onFillRequest() times out." into oc-mr1-dev
...
am: 6ba128762f
2017-08-15 22:49:15 +00:00
TreeHugger Robot
6ba128762f
Merge "Calls CancellationSignal when onFillRequest() times out." into oc-mr1-dev
2017-08-15 22:23:57 +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
Felipe Leme
2220049d58
Merge "Additional documentation about Autofill / WebView security." into oc-dev am: 36cbdef880
...
am: a3c2cee055
2017-08-15 21:48:32 +00:00
Felipe Leme
82e7dfcae8
Merge "Additional documentation about Autofill / WebView security." into oc-dev am: 36cbdef880
...
am: 7e9f379b50
2017-08-15 21:42:40 +00:00
Charles He
77f3300f48
[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: b0fa5855dc
2017-08-15 21:35:05 +00:00
Felipe Leme
a3c2cee055
Merge "Additional documentation about Autofill / WebView security." into oc-dev
...
am: 36cbdef880
2017-08-15 21:33:01 +00:00
Felipe Leme
7e9f379b50
Merge "Additional documentation about Autofill / WebView security." into oc-dev
...
am: 36cbdef880
2017-08-15 21:32:44 +00:00
Charles He
2ae412019b
[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
2017-08-15 21:32:01 +00:00
Charles He
b0fa5855dc
[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
2017-08-15 21:16:36 +00:00
Charles He
51ca967453
[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
2017-08-15 21:15:55 +00:00
TreeHugger Robot
36cbdef880
Merge "Additional documentation about Autofill / WebView security." into oc-dev
2017-08-15 21:12:32 +00:00
Android Build Merger (Role)
0fa9328b80
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4 am: 159cd14334 am: 24587d57cf
...
Change-Id: If5cad5c0f361acda25df4d90de06821d16e689c0
2017-08-15 20:47:03 +00:00
Charles He
24587d57cf
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4
...
am: 159cd14334
2017-08-15 20:42:11 +00:00
Lucas Dupin
6f8363aea2
Merge "Improved WallpaperService.Engine tests" into oc-mr1-dev
...
am: 3d141421f8
2017-08-15 20:34:43 +00:00
TreeHugger Robot
3d141421f8
Merge "Improved WallpaperService.Engine tests" into oc-mr1-dev
2017-08-15 20:24:27 +00:00
Lucas Dupin
e2efebc8a2
Do not filter out some colors
...
Colors specified manually using the public WallpaperColors
constructor should not be blacklisted.
Test: runtest -x tests/Internal/src/android/app/WallpaperColorsTest.java
Test: runtest -x tests/Internal/src/com/android/internal/colorextraction/types/TonalTest.java
Change-Id: I96faf413e3629c247220d825bb7c3480ed2f1003
Fixes: 64361146
2017-08-15 11:30:19 -07:00
Charles He
159cd14334
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4
...
Change-Id: I6bb7e6146e9a5a1a7c4721c496b1088fb3209f00
2017-08-15 17:54:35 +00:00
Charles He
40317127f4
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4
...
Change-Id: Iea8871d4f1a491e4571e2152afbf8855bf451478
2017-08-15 17:54:05 +00:00
Charles He
4acf4fabf4
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49
...
Change-Id: Idcc4beaf75e1aba8609aa18ad1850e0796a17741
2017-08-15 17:53:35 +00:00
Charles He
a3c1de7e49
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d
...
Change-Id: Ia5ad4b5d36d92caa26fa69951180320848c372e7
2017-08-15 17:52:57 +00:00
Charles He
6dfc8d8d4d
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f
...
Change-Id: I2fce56d688cc0a4111668c695c9cf9b1c930faf8
2017-08-15 17:52:27 +00:00
Charles He
1cd9e8096f
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0
...
Change-Id: Ia0d267bb2013d7ddfe26dddfa35f3f396cca7f20
2017-08-15 17:51:58 +00:00
Charles He
b1141b6ff0
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c
...
Change-Id: Ic72c354aaec594f02567949e294be2c10da47853
2017-08-15 17:51:28 +00:00
Felipe Leme
f480e8cad5
Improved autofill support on DatePicker and TimePicker:
...
- Save autofilled value so UI is properly highlighted.
- Notify TimePicker listener just once.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Test: cts-tradefed run commandAndExit cts-dev -m CtsWidgetTestCases -t android.widget.cts.DatePickerTest
Test: cts-tradefed run commandAndExit cts-dev -m CtsWidgetTestCases -t android.widget.cts.TimePickerTest
Fixes: 37098837
Change-Id: I38d64c107f6059b94c92676ea37681006474f519
2017-08-15 10:42:58 -07:00
