Android Build Merger (Role)
bae1ea6478
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev) am: 33c37cb37c am: 93d9547b61 am: 5ddeef7116 am: 1890afd456
...
Change-Id: I1d6b280c14a7a6166221ea0d1448de7bc7feb18c
2018-04-09 22:24:28 +00:00
Android Build Merger (Role)
1890afd456
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev) am: 33c37cb37c am: 93d9547b61 am: 5ddeef7116
...
Change-Id: Ib3a14de258a548393279940fd3aeb067f2596ca8
2018-04-09 22:24:22 +00:00
Android Build Merger (Role)
5ddeef7116
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev) am: 33c37cb37c am: 93d9547b61
...
Change-Id: If515d9ec229e37bdc1368a96ae1f1b474dd50ebe
2018-04-09 22:24:16 +00:00
Android Build Merger (Role)
93d9547b61
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev) am: 33c37cb37c
...
Change-Id: I793b787b6275262f1df6caa9262054e15c94840f
2018-04-09 22:24:08 +00:00
akirilov
33c37cb37c
RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev)
...
Test: added AccessibilityEndToEndTest#testPackageNameCannotBeFaked
cts-tradefed run cts -m CtsAccessibilityServiceTestCases
cts-tradefed run cts -m CtsAccessibilityTestCases
Bug: 69981755
Change-Id: I187e3e9839f654cea9e06e5de93e10e4d1de3109
2018-04-09 22:24:05 +00:00
Android Build Merger (Role)
75767d1e3c
[automerger] Rework thumbnail cleanup am: 0dc23f95a1
...
Change-Id: Ia3a740184191990fa43ca705b5eae8ea572fb6c1
2018-03-13 00:23:52 +00:00
Marco Nelissen
0dc23f95a1
Rework thumbnail cleanup
...
Bug: 63766886
Test: ran CTS tests
Change-Id: I1f92bb014e275eafe3f42aef1f8c817f187c6608
Merged-In: I1f92bb014e275eafe3f42aef1f8c817f187c6608
2018-03-13 00:23:51 +00:00
Marco Nelissen
0d0ff3390d
Merge "Rework thumbnail cleanup" into nyc-mr1-dev
2018-03-12 21:29:58 +00:00
Android Build Merger (Role)
cb9dd5d0e6
[automerger] Rework thumbnail cleanup am: 82a2a87474 am: 97eb9d056a
...
Change-Id: Id58fd0db50cf10dd0af21464259e7a6e366edecd
2018-03-09 20:33:52 +00:00
Android Build Merger (Role)
97eb9d056a
[automerger] Rework thumbnail cleanup am: 82a2a87474
...
Change-Id: Ifbeecd9b3406da6151067987709776adeb807c1f
2018-03-09 20:33:45 +00:00
Marco Nelissen
82a2a87474
Rework thumbnail cleanup
...
Bug: 63766886
Test: ran CTS tests
Change-Id: I1f92bb014e275eafe3f42aef1f8c817f187c6608
Merged-In: I1f92bb014e275eafe3f42aef1f8c817f187c6608
2018-03-09 20:33:30 +00:00
Android Build Merger (Role)
6b1b3c9bdc
[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0 am: bdff04aba3 am: 7341805cac am: 885a2ecf96 am: 54f1b302ab
...
Change-Id: I09260b353e45dac4c59b920b0166d40b3eb810aa
2018-01-31 11:21:02 +00:00
Android Build Merger (Role)
54f1b302ab
[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0 am: bdff04aba3 am: 7341805cac am: 885a2ecf96
...
Change-Id: Ie23e4a58c906b1afe4e47e915251d44c628c9a72
2018-01-31 11:20:55 +00:00
Android Build Merger (Role)
885a2ecf96
[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0 am: bdff04aba3 am: 7341805cac
...
Change-Id: Ib4cb67450dcb8e35693030d77e2ec815d23275d1
2018-01-31 11:20:48 +00:00
Android Build Merger (Role)
7341805cac
[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0 am: bdff04aba3
...
Change-Id: Ieddabe1b12f34bd7632ce893ef4e0c298f5c44df
2018-01-31 11:20:41 +00:00
Android Build Merger (Role)
bdff04aba3
[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0
...
Change-Id: Ia7b1157fb7f2066e26dc82ec703f39cd9fa69fd7
2018-01-31 11:20:28 +00:00
Android Build Merger (Role)
373cfa75c0
[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9
...
Change-Id: If07298bb4ecf8a55391a014568a3ea264358b0e9
2018-01-31 11:20:21 +00:00
Android Build Merger (Role)
d3c0db66b9
[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2
...
Change-Id: I3fd20a3ee5eaa6be1c1989f13d40aed34136557e
2018-01-31 11:20:15 +00:00
Android Build Merger (Role)
fddbf1b6b2
[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137
...
Change-Id: Ic336b5fafebabdd4a5ad4d775a96d76739189a09
2018-01-31 11:20:08 +00:00
Android Build Merger (Role)
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7
...
Change-Id: I20336a5786e753e6941b9a784068480475415110
2018-01-31 11:19:56 +00:00
Adam Vartanian
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
...
The WHATWG URL parsing algorithm [1] used by browsers says that for
"special" URL schemes (which is basically all commonly-used
hierarchical schemes, including http, https, ftp, and file), the host
portion ends if a \ character is seen, whereas this class previously
continued to consider characters part of the hostname. This meant
that a malicious URL could be seen as having a "safe" host when viewed
by an app but navigate to a different host when passed to a browser.
[1] https://url.spec.whatwg.org/#host-state
Bug: 71360761
Test: vogar frameworks/base/core/tests/coretests/src/android/net/UriTest.java (on NYC branch)
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: Id53f7054d1be8d59bbcc7e219159e59a2425106e
2018-01-31 11:14:45 +00:00
Adam Vartanian
a2149abe3a
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e am: 49e5fca362 am: 240b55de2c am: 3ac5dabc21 am: f61daaa333 am: 49dfdd66cc
...
am: eb4598afba
2017-11-07 23:30:44 +00:00
Adam Vartanian
eb4598afba
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e am: 49e5fca362 am: 240b55de2c am: 3ac5dabc21 am: f61daaa333
...
am: 49dfdd66cc
2017-11-07 23:04:25 +00:00
Adam Vartanian
49dfdd66cc
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e am: 49e5fca362 am: 240b55de2c am: 3ac5dabc21
...
am: f61daaa333
2017-11-07 22:41:48 +00:00
Adam Vartanian
f61daaa333
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e am: 49e5fca362 am: 240b55de2c
...
am: 3ac5dabc21
2017-11-07 22:12:09 +00:00
Adam Vartanian
3ac5dabc21
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e am: 49e5fca362
...
am: 240b55de2c
2017-11-07 21:56:10 +00:00
Adam Vartanian
240b55de2c
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e
...
am: 49e5fca362
2017-11-07 21:41:55 +00:00
Adam Vartanian
49e5fca362
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3
...
am: eee677386e
2017-11-07 21:29:27 +00:00
Adam Vartanian
eee677386e
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814
...
am: 4158c9fbf3
2017-11-07 21:02:07 +00:00
Adam Vartanian
4158c9fbf3
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37
...
am: 6a9c7c4814
2017-11-07 20:51:02 +00:00
Adam Vartanian
6a9c7c4814
Adjust Uri host parsing to use last instead of first @.
...
am: cd6228dd37
2017-11-07 20:41:28 +00:00
Adam Vartanian
cd6228dd37
Adjust Uri host parsing to use last instead of first @.
...
Malformed authority segments can currently cause the parser to produce
a hostname that doesn't match the hostname produced by the WHATWG URL
parsing algorithm* used by browsers, which means that a URL could be seen
as having a "safe" host when checked by an Android app but actually visit
a different host when passed to a browser. The WHATWG URL parsing
algorithm always produces a hostname based on the last @ in the authority
segment, so we do the same.
* https://url.spec.whatwg.org/#authority-state resets the "buffer", which
is being used to build up the host name, each time an @ is found, so it
has the effect of using the content between the final @ and the end
of the authority section as the hostname.
Bug: 68341964
Test: vogar android.net.UriTest (on NYC branch)
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: Idca79f35a886de042c94d6ab66787c2e98ac8376
2017-11-07 15:51:53 +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
TreeHugger Robot
039b357a46
Merge "Fix security hole in GateKeeperResponse." into mnc-dev
2017-08-15 19:30:53 +00: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
Stanley Tng
f6b59c80da
DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)
...
There are intermittent issues where either the returned Bluetooth
MAC address to Java framework is uninitialized or this address update
arrives too late. This fix will do 2 things:
(1) Returns error when MAC address is unavailable in the native code.
(2) Updates the MAC address later by adding a new broadcast event.
Test: Check address for these cases: factory reset, system reboot, and
Bluetooth re-enable.
Bug: 36709382
Merged-In: I09720193e38fdf9139e1bb146f8e1847e2b65b1a
(cherry picked from commit ad4d1d8e28
2017-07-31 21:14:50 +00:00
Phil Weaver
72c56fb84a
Merge "Back-port fixes for b/62196835" into nyc-mr1-dev am: 4a1dc3458d
...
am: a84f7a3028
2017-07-19 01:01:06 +00:00
Phil Weaver
a84f7a3028
Merge "Back-port fixes for b/62196835" into nyc-mr1-dev
...
am: 4a1dc3458d
2017-07-19 00:53:13 +00:00
Phil Weaver
996bc6bc12
Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714
...
am: 9625d164e4
2017-07-18 23:41:26 +00:00
Phil Weaver
9625d164e4
Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56
...
am: 0ddd7e4714
2017-07-18 23:35:25 +00:00
Phil Weaver
0ddd7e4714
Merge "Back-port fixes for b/62196835" into mnc-dev
...
am: 093c7a8e56
2017-07-18 23:28:55 +00:00
Phil Weaver
41ff5389da
Back-port fixes for b/62196835
...
Bug: 62196835
Test: Created an accessibility service that displays a system
and a toast overlay, confirmed that it disappeared when we
reached the accessibility permission screen that uses this
flag.
Change-Id: Ic51ead670fc480e549512ba1d02f49d9c13bc3f0
2017-07-18 15:27:23 -07:00
Phil Weaver
4fa8b51c0c
Merge "Back-port fixes for b/62196835" into nyc-dev
...
am: 0b0834fbe8
2017-07-18 21:44:32 +00:00
Phil Weaver
7a237059c6
Back-port fixes for b/62196835
...
Bug: 62196835
Test: Created an accessibility service that displays a system
and a toast overlay, confirmed that it disappeared when we
reached the accessibility permission screen that uses this
flag.
Change-Id: Ic51ead670fc480e549512ba1d02f49d9c13bc3f0
2017-07-18 10:09:42 -07:00
