Lucas Dupin
1d0eda938a
Merge "API Council feedback" into oc-mr1-dev am: 07c83d00c9
...
am: fda1152e59
2017-08-17 03:24:34 +00:00
Romain Guy
11159d15ed
Merge "Merge "Hide shared buffer mode/auto refresh on Surface" into oc-mr1-dev am: ee3602595a" into oc-mr1-dev-plus-aosp
...
am: 9446e27025
2017-08-17 03:17:39 +00:00
Luis Hector Chavez
07f403a0ea
Merge "Improve container capability bounding in containers" am: 586fd52b34 am: ed05287c55 am: 755baf92b4 am: 64f1d42e6c
...
am: 22f95dbdc0
2017-08-17 02:59:38 +00:00
Felipe Leme
ee5aa78c2e
Merge "Improved autofill support on DatePicker and TimePicker:" into oc-mr1-dev am: 6598a4ed52
...
am: e6be222bdf
2017-08-17 02:16:10 +00:00
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
Lucas Dupin
fda1152e59
Merge "API Council feedback" into oc-mr1-dev
...
am: 07c83d00c9
2017-08-16 23:38:38 +00:00
TreeHugger Robot
abe61c2a47
Merge "Add deltaX/Y to a11y scroll events"
2017-08-16 23:33:09 +00:00
Android Build Merger (Role)
9446e27025
Merge "Merge "Hide shared buffer mode/auto refresh on Surface" into oc-mr1-dev am: ee3602595a" into oc-mr1-dev-plus-aosp
2017-08-16 23:31:46 +00:00
Romain Guy
7d513b6538
Merge "Hide shared buffer mode/auto refresh on Surface" into oc-mr1-dev
...
am: ee3602595a
2017-08-16 23:24:55 +00:00
Luis Hector Chavez
22f95dbdc0
Merge "Improve container capability bounding in containers" am: 586fd52b34 am: ed05287c55 am: 755baf92b4
...
am: 64f1d42e6c
2017-08-16 23:11:35 +00:00
TreeHugger Robot
07c83d00c9
Merge "API Council feedback" into oc-mr1-dev
2017-08-16 22:55:52 +00:00
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
ee3602595a
Merge "Hide shared buffer mode/auto refresh on Surface" into oc-mr1-dev
2017-08-16 22:49:49 +00:00
Luis Hector Chavez
64f1d42e6c
Merge "Improve container capability bounding in containers" am: 586fd52b34 am: ed05287c55
...
am: 755baf92b4
2017-08-16 22:11:14 +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
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
Luis Hector Chavez
755baf92b4
Merge "Improve container capability bounding in containers" am: 586fd52b34
...
am: ed05287c55
2017-08-16 21:43:28 +00:00
Luis Hector Chavez
ed05287c55
Merge "Improve container capability bounding in containers"
...
am: 586fd52b34
2017-08-16 21:32:13 +00:00
Treehugger Robot
586fd52b34
Merge "Improve container capability bounding in containers"
2017-08-16 21:16:50 +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
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
0df906d279
Merge "docs: Updated ShortcutManager API reference guide." into oc-dev am: 80376a98a5
...
am: b9db19de6a
2017-08-16 19:16:12 +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
b9db19de6a
Merge "docs: Updated ShortcutManager API reference guide." into oc-dev
...
am: 80376a98a5
2017-08-16 19:01:35 +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
Romain Guy
010f082490
Hide shared buffer mode/auto refresh on Surface
...
Bug: 63858546
Test: Compile & boot
Change-Id: I34372593d4b47b143e65d30f669f883c69653f62
2017-08-16 10:02:10 -07: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
Luis Hector Chavez
72042c99a6
Improve container capability bounding in containers
...
This change stops relying on the ro.boot.container property for dropping
a subset of capabilities and instead relies on the effective capability
mask of the Zygote process, prior to forking.
When Android is running in a pid/mount/net/user namespace, even if a
particular capability is present, some operations that require that
capability check whether it is allowed in the init namespace (instead of
in the current namespace), so they would fail even with the capability
granted within the namespace. So, explicitly dropping the capabilities
from the beginning allows for clearer signalling of which operations can
be expected to work instead of failing silently for mysterious reasons.
Bug: 63579953
Test: aosp_bullhead-eng still boots
Test: Running Zygote without CAP_SYS_MODULE makes it such that
system_server does not request it.
Change-Id: I1d18d13341bcc04e701fd14092e7e94961728620
2017-08-16 08:21:58 -07: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
