OSDN Git Service
Jordan Liu [Thu, 9 Nov 2017 19:35:09 +0000 (19:35 +0000)]
Merge "Add config to use a display rule that ServiceState was considered" am:
bbaa19cad3
am:
cd89929497
Change-Id: Ibc4bcf689d31d0841f97eac67578705ccc59dc8f
Jordan Liu [Thu, 9 Nov 2017 18:51:30 +0000 (18:51 +0000)]
Merge "Add config to use a display rule that ServiceState was considered"
am:
bbaa19cad3
Change-Id: I7adbdcdcefaf86e9cf6775aa23aac2618149cf92
Jordan Liu [Thu, 9 Nov 2017 18:24:16 +0000 (18:24 +0000)]
Merge "Add config to use a display rule that ServiceState was considered"
Jon Dormody [Thu, 9 Nov 2017 16:42:19 +0000 (16:42 +0000)]
Merge "Docs: Added a link to Updating Your Security Provider to Protect Against SSL Exploits" into oc-dev am:
459735662f am:
13e959bbec
am:
d9696eb356
Change-Id: I616cd581d38cdae91c53b31325e08919efd92a8c
Jon Dormody [Thu, 9 Nov 2017 16:26:50 +0000 (16:26 +0000)]
Merge "Docs: Added a link to Updating Your Security Provider to Protect Against SSL Exploits" into oc-dev am:
459735662f
am:
13e959bbec
Change-Id: Ic15e947e38c10d394081598e2c2886854388996a
Jon Dormody [Thu, 9 Nov 2017 16:17:35 +0000 (16:17 +0000)]
Merge "Docs: Added a link to Updating Your Security Provider to Protect Against SSL Exploits" into oc-dev
am:
459735662f
Change-Id: I31f036fa2365084454ac7899d92580e985bd9f21
Jon Dormody [Thu, 9 Nov 2017 16:05:13 +0000 (16:05 +0000)]
Merge "Docs: Added a link to Updating Your Security Provider to Protect Against SSL Exploits" into oc-dev
Hugo Benichi [Thu, 9 Nov 2017 12:43:52 +0000 (12:43 +0000)]
Merge "MacAddress follow-up: define the core of the class" am:
cd35c65b5b
am:
d39a50350a
Change-Id: I1063cbb5a468818f68ee5406e52b6cd74c85c4bf
Hugo Benichi [Thu, 9 Nov 2017 12:34:40 +0000 (12:34 +0000)]
Merge "MacAddress follow-up: define the core of the class"
am:
cd35c65b5b
Change-Id: Ic86df7e56a63d3f84ccaebefa904c7625105c581
Hugo Benichi [Thu, 9 Nov 2017 12:22:17 +0000 (12:22 +0000)]
Merge "MacAddress follow-up: define the core of the class"
Hugo Benichi [Wed, 8 Nov 2017 15:22:25 +0000 (00:22 +0900)]
MacAddress follow-up: define the core of the class
Test: new unit test parts of $ runtest frameworks-net
Change-Id: I08c57d2d656802f7bdd7a93fde711a7e77247583
Andreas Gampe [Thu, 9 Nov 2017 03:40:32 +0000 (03:40 +0000)]
Merge "Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.inactive"" am:
08efd36872
am:
8249a5d677
Change-Id: I28aa38d66ab9c59c269157aff71edec5bd440942
Andreas Gampe [Thu, 9 Nov 2017 03:32:07 +0000 (03:32 +0000)]
Merge "Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.inactive""
am:
08efd36872
Change-Id: I97b6bbce9a969f06b923bebd60ccf9a5dee91e9e
Treehugger Robot [Thu, 9 Nov 2017 03:21:27 +0000 (03:21 +0000)]
Merge "Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.inactive""
Jonathan Dormody [Wed, 8 Nov 2017 23:58:16 +0000 (16:58 -0700)]
Docs: Added a link to Updating Your Security Provider to Protect Against
SSL Exploits
Test: make ds-docs
Bug:
19110275
Change-Id: I3b0a35715c16c4e30a47aab9cbaf991770426c57
Brad Ebinger [Wed, 8 Nov 2017 23:13:35 +0000 (23:13 +0000)]
Merge "Remove ImsService Feature Interfaces" am:
abfdf0e03d
am:
61fb76d9a0
Change-Id: Ib8602579b1028fd086c4fc0a13897a671bb6b73e
Brad Ebinger [Wed, 8 Nov 2017 23:04:09 +0000 (23:04 +0000)]
Merge "Remove ImsService Feature Interfaces"
am:
abfdf0e03d
Change-Id: Ie142d4673c2a3930b3e7c3bcba617e5e26c8fb9c
Brad Ebinger [Wed, 8 Nov 2017 22:54:33 +0000 (22:54 +0000)]
Merge "Remove ImsService Feature Interfaces"
Ivan Lozano [Wed, 8 Nov 2017 20:28:30 +0000 (20:28 +0000)]
Merge "Disable integer sanitizer in release function." am:
969ceebc5d
am:
cd9e2c04fa
Change-Id: I0c586b04bf232703ddc33bf162ac82148f241e11
Ivan Lozano [Wed, 8 Nov 2017 20:20:06 +0000 (20:20 +0000)]
Merge "Disable integer sanitizer in release function."
am:
969ceebc5d
Change-Id: If880a4a81b11c32a5906ccc3f0d999ae515cfbc8
Ivan Lozano [Wed, 8 Nov 2017 20:07:36 +0000 (20:07 +0000)]
Merge "Disable integer sanitizer in release function."
yuemingw [Wed, 8 Nov 2017 19:45:14 +0000 (19:45 +0000)]
Merge "Add OWNED_BY field." am:
107141be5c
am:
9c7be233c3
Change-Id: Icf11a35867625a5a47450f5dc9a1b05ec00de502
yuemingw [Wed, 8 Nov 2017 19:36:44 +0000 (19:36 +0000)]
Merge "Add OWNED_BY field."
am:
107141be5c
Change-Id: Ib3ee22a0407881e6e7e754ea3504f5568c0ac31a
Treehugger Robot [Wed, 8 Nov 2017 19:28:37 +0000 (19:28 +0000)]
Merge "Add OWNED_BY field."
nharold [Wed, 8 Nov 2017 18:20:06 +0000 (18:20 +0000)]
Merge "Fix signature for finalize() to resolve API Lint error" am:
c8ff280e73
am:
c09d405e1d
Change-Id: I1f8915547876e0e0045724eb9a1e29123ab4edda
Benedict Wong [Wed, 8 Nov 2017 18:12:25 +0000 (18:12 +0000)]
Merge "Update documentation for AES-GCM-ESP keymat length" am:
3db35dfcd5
am:
6491b03410
Change-Id: I5e61a9c28dac49f2dca554ce2fdf755ab7be0dab
nharold [Wed, 8 Nov 2017 18:11:20 +0000 (18:11 +0000)]
Merge "Fix signature for finalize() to resolve API Lint error"
am:
c8ff280e73
Change-Id: I1ad1ee6abafea702d9bb64f45ebad5ea307f25ec
Benedict Wong [Wed, 8 Nov 2017 18:02:53 +0000 (18:02 +0000)]
Merge "Update documentation for AES-GCM-ESP keymat length"
am:
3db35dfcd5
Change-Id: I71b24c9da8c677e35d05b6623eb99ec17f823b4b
nharold [Wed, 8 Nov 2017 17:56:43 +0000 (17:56 +0000)]
Merge "Fix signature for finalize() to resolve API Lint error"
Ivan Lozano [Wed, 8 Nov 2017 17:48:11 +0000 (09:48 -0800)]
Disable integer sanitizer in release function.
EphemeralStorage::release was causing an unsigned integer overflow on
boot due to the way the for loop is constructed. This function doesn't
need to be sanitized. This adds the no_sanitize attribute to the
function.
Bug:
30969751
Test: Compiles and device boots without runtime error.
Change-Id: Id28a2891624c1fe077fa5e27051540a39e33fe71
Benedict Wong [Wed, 8 Nov 2017 17:47:40 +0000 (17:47 +0000)]
Merge "Update documentation for AES-GCM-ESP keymat length"
Brad Ebinger [Wed, 8 Nov 2017 17:30:49 +0000 (17:30 +0000)]
Merge "Move ImsServiceProxy to opt/net/ims" am:
b5d2f0c24f
am:
6093305789
Change-Id: Ic1b21cd9a0fc906601bf37bf5e71aafdcbf0bd47
Brad Ebinger [Wed, 8 Nov 2017 17:21:53 +0000 (17:21 +0000)]
Merge "Move ImsServiceProxy to opt/net/ims"
am:
b5d2f0c24f
Change-Id: If8fbd0b2adf9f3f2f9a5d4a670b1e0bf1b445066
Brad Ebinger [Wed, 8 Nov 2017 17:12:44 +0000 (17:12 +0000)]
Merge "Move ImsServiceProxy to opt/net/ims"
Andreas Gampe [Wed, 8 Nov 2017 17:09:48 +0000 (17:09 +0000)]
Merge "Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.shared"" am:
f597ad5106
am:
41c52377ed
Change-Id: I9058f70565327fe772b966a2fc3d55f187e267a2
Andreas Gampe [Wed, 8 Nov 2017 16:53:10 +0000 (16:53 +0000)]
Merge "Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.shared""
am:
f597ad5106
Change-Id: I1d4f37c16ff9dfe8cdc998274d4e8b50e1987be7
Tobias Thierer [Wed, 8 Nov 2017 16:52:46 +0000 (16:52 +0000)]
Merge "Track deprecation/replacement of Os methods that depend on Mutable*" am:
e8b07e5bef
am:
d20ae24fb1
Change-Id: I275c4fb658f6c158d38a6062bf1622e239e1603c
Tobias Thierer [Wed, 8 Nov 2017 16:44:30 +0000 (16:44 +0000)]
Merge "Track deprecation/replacement of Os methods that depend on Mutable*"
am:
e8b07e5bef
Change-Id: Iebebb843f0857cad4ace13731d1f066ab84eabb6
Andreas Gampe [Wed, 8 Nov 2017 16:40:12 +0000 (16:40 +0000)]
Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.inactive"
This reverts commit
84bf6b809d5b1d80137f1653ab2346ebe0b08ca6.
Reason for revert: ART default properties are now in /system.
Bug:
68755013
Change-Id: I8f13fbb3afe91da54afafbafc758df4e194def11
Brad Ebinger [Wed, 8 Nov 2017 16:37:36 +0000 (16:37 +0000)]
Merge "Switch class hierarchy of ImsServiceProxy and compat" am:
7805de4002
am:
90f22d4bf6
Change-Id: I227b081551539e4299f63c304a4e27d9be2070c7
Treehugger Robot [Wed, 8 Nov 2017 16:36:59 +0000 (16:36 +0000)]
Merge "Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.shared""
Tobias Thierer [Wed, 8 Nov 2017 16:34:03 +0000 (16:34 +0000)]
Merge "Track deprecation/replacement of Os methods that depend on Mutable*"
Brad Ebinger [Wed, 8 Nov 2017 16:30:27 +0000 (16:30 +0000)]
Merge "Switch class hierarchy of ImsServiceProxy and compat"
am:
7805de4002
Change-Id: I0ec39abb8006c7b29b449a59c7408a97549671f0
Brad Ebinger [Wed, 8 Nov 2017 16:20:39 +0000 (16:20 +0000)]
Merge "Switch class hierarchy of ImsServiceProxy and compat"
yuemingw [Wed, 8 Nov 2017 13:12:18 +0000 (13:12 +0000)]
Add OWNED_BY field.
Bug:
68208199
Test: later
Design doc: https://docs.google.com/document/d/1UEYjhRGSEwwccPLs_FzFD-IeOsVq63gxmAHNtDfnzAY/edit#heading=h.jza6dz6kh6bz
Change-Id: Ic78df7902523bad4b3d40bacb73b17d767226aac
Masaho Nishikawa [Wed, 1 Nov 2017 11:33:36 +0000 (20:33 +0900)]
Add config to use a display rule that ServiceState was considered
Add config to use a spn/plmn display rule that the roaming state of
ServiceState was considered. The default value is false.
Test: manual - Verified that PLMN/SPN which the carrier configuration
was considered is displayed.
Bug:
67835339
Change-Id: I05a4938ae51b03190e06e407c41c894b8feb8ea7
Hugo Benichi [Wed, 8 Nov 2017 06:46:49 +0000 (06:46 +0000)]
Merge "Define MacAddress class" am:
925349ac8f
am:
37caaaa705
Change-Id: I377de35ab9ce9d8bf44bd90295a2a41fbea06d7a
Hugo Benichi [Wed, 8 Nov 2017 06:39:40 +0000 (06:39 +0000)]
Merge "Define MacAddress class"
am:
925349ac8f
Change-Id: If270c17b1b763e302b848fba2fe4660ce5929018
Hugo Benichi [Wed, 8 Nov 2017 06:30:04 +0000 (06:30 +0000)]
Merge "Define MacAddress class"
Hugo Benichi [Wed, 8 Nov 2017 03:48:40 +0000 (03:48 +0000)]
Merge "Networking metrics: minor pretty printing improvements" am:
ee56b4a65c
am:
5480314039
Change-Id: I26ec8ca2d10eb5071de701043f60b67bcfbf7ba5
Hugo Benichi [Wed, 8 Nov 2017 03:39:55 +0000 (03:39 +0000)]
Merge "Networking metrics: minor pretty printing improvements"
am:
ee56b4a65c
Change-Id: I5a19824564a56881ffe0ea72556490c71c0d9c23
Treehugger Robot [Wed, 8 Nov 2017 03:27:25 +0000 (03:27 +0000)]
Merge "Networking metrics: minor pretty printing improvements"
Andreas Gampe [Wed, 8 Nov 2017 02:21:58 +0000 (02:21 +0000)]
Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.shared"
This reverts commit
e131dac848cb4d0998e1dee2219382250c71d277.
Reason for revert: ART default properties are now in /system.
Bug:
68755013
Change-Id: I32d938abb73c8d8df74716ede8032d9874086fda
Hugo Benichi [Thu, 12 Oct 2017 12:33:40 +0000 (21:33 +0900)]
Define MacAddress class
Test: new unit tests part of $ runtest frameworks-net
Change-Id: I5a6a868ff86e9bffdc551d4e2bb486b585525c30
Nathan Harold [Wed, 8 Nov 2017 01:17:45 +0000 (17:17 -0800)]
Fix signature for finalize() to resolve API Lint error
The API linter on goog/master noticed that this method is
listed in the public API even though it's protected. The
change is probably related to a signature change from the
internal finalize method which throws a Throwable. Fix the
method in IpSecManager to throw Throwable, which should
fix the current.txt and resolve the lint error.
Bug:
69006767
Test: compilation, make update-api
Change-Id: I173d014baaa505c365b7916fcb52f2a8b4af9373
Benedict Wong [Thu, 2 Nov 2017 00:14:25 +0000 (17:14 -0700)]
Update documentation for AES-GCM-ESP keymat length
Added notes that keymat length must include 32 bits of salt.
Bug:
68672051
Test: Frameworks-net unit tests & IpSecManager CTS tests run
Change-Id: I0ae0c5be8a45b2374783b3bd1fa8bf930f15e687
Adam Vartanian [Wed, 8 Nov 2017 01:13:26 +0000 (01:13 +0000)]
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 am:
a2149abe3a am:
560fb5d050 am:
2edd31e7fc
am:
97ff9f9d27
Change-Id: Ied66e9bfef6708e0c03b0f97240e3a4b67780ddf
Hugo Benichi [Tue, 7 Nov 2017 12:42:10 +0000 (21:42 +0900)]
Networking metrics: minor pretty printing improvements
Bug:
65700460
Test: manually verified the output of $ adb shell dumpsys connmetrics
Change-Id: Ieae535b48d2e2b6e9087431d345c8f916006bb6c
Adam Vartanian [Wed, 8 Nov 2017 00:38:27 +0000 (00:38 +0000)]
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 am:
a2149abe3a am:
560fb5d050
am:
2edd31e7fc
Change-Id: Ic915bece1025d8ad8a0ed05e9b20afa9bfcdd811
Adam Vartanian [Wed, 8 Nov 2017 00:15:23 +0000 (00:15 +0000)]
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 am:
a2149abe3a
am:
560fb5d050
Change-Id: I088a828022a70b0d2ac1b88c4fab3801528eb4f8
Adam Vartanian [Tue, 7 Nov 2017 23:50:35 +0000 (23:50 +0000)]
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
am:
a2149abe3a
Change-Id: I48d611e91318a8f85f12fcff5fc00de8b1f834c9
Adam Vartanian [Tue, 7 Nov 2017 23:30:44 +0000 (23:30 +0000)]
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
Change-Id: Ibf435bc90e013af2a7c72f1988ac0f78485f2c23
Adam Vartanian [Tue, 7 Nov 2017 23:04:25 +0000 (23:04 +0000)]
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
Change-Id: I49d0744049b593ea47ede3ad9e128a5344196811
Hugo Benichi [Tue, 7 Nov 2017 22:53:09 +0000 (22:53 +0000)]
Merge "Refactor ApfFilter creation" am:
5e619dce66
am:
6c25e1e24d
Change-Id: I3f406b08287092d4e2bc23f158693cea6f6646e4
Hugo Benichi [Tue, 7 Nov 2017 22:42:10 +0000 (22:42 +0000)]
Merge "Refactor ApfFilter creation"
am:
5e619dce66
Change-Id: I0be4951cf3feafc94564fad436dec3e8bfceddc4
Adam Vartanian [Tue, 7 Nov 2017 22:41:48 +0000 (22:41 +0000)]
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
Change-Id: Iee679fb3a115f6c1a2683905e5b392ec665aee33
Hugo Benichi [Tue, 7 Nov 2017 22:22:19 +0000 (22:22 +0000)]
Merge "Refactor ApfFilter creation"
Adam Vartanian [Tue, 7 Nov 2017 22:12:09 +0000 (22:12 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e am:
49e5fca362 am:
240b55de2c
am:
3ac5dabc21
Change-Id: I43fbad45f90ec2d1fb48fecbd2d73a05f39730a9
Adam Vartanian [Tue, 7 Nov 2017 21:56:10 +0000 (21:56 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e am:
49e5fca362
am:
240b55de2c
Change-Id: Ie3d378e8d9aeaff6f45838ebe988a5799f6acf3b
Adam Vartanian [Tue, 7 Nov 2017 21:41:55 +0000 (21:41 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e
am:
49e5fca362
Change-Id: Id6f38542623d768bebcfae7e79e8e49450329037
Adam Vartanian [Tue, 7 Nov 2017 21:29:27 +0000 (21:29 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3
am:
eee677386e
Change-Id: Ifd94d94c5376a6b4f1174aa7c2c8bb6d40199d89
Adam Vartanian [Tue, 7 Nov 2017 21:02:07 +0000 (21:02 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814
am:
4158c9fbf3
Change-Id: I61bc0f5471d8f7a9a59136f320d465f2ee81b518
Adam Vartanian [Tue, 7 Nov 2017 20:51:02 +0000 (20:51 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37
am:
6a9c7c4814
Change-Id: I80bedf58833511d336839df9f17daf65cfebfacf
Adam Vartanian [Tue, 7 Nov 2017 20:41:28 +0000 (20:41 +0000)]
Adjust Uri host parsing to use last instead of first @.
am:
cd6228dd37
Change-Id: I5db66a5a2073acaffe0560999c914a78df362c51
Brad Ebinger [Tue, 7 Nov 2017 19:05:51 +0000 (11:05 -0800)]
Remove ImsService Feature Interfaces
The ImsService feature interfaces were designed
to support a flat ImsService AIDL. This is not
necessary anymore, so this interface is being
removed as part of prep for the new ImsService
definition.
Test: Manual
Change-Id: Iefbcd168441ce2547523cf3e6a99ab3de5f3f823
Jordan Liu [Tue, 7 Nov 2017 18:51:57 +0000 (18:51 +0000)]
Merge "Add a carrier config indicating whether user can edit a voicemail number" am:
1f8ee4ff25
am:
e968d500f5
Change-Id: Ifc4a120e14dd2e2bc6f2bdfe06acfffdf6837bea
Jordan Liu [Tue, 7 Nov 2017 18:39:06 +0000 (18:39 +0000)]
Merge "Add a carrier config indicating whether user can edit a voicemail number"
am:
1f8ee4ff25
Change-Id: I7d86a7b3fe4348bfd148e8167b6213e9d27e67c7
Jordan Liu [Tue, 7 Nov 2017 18:28:33 +0000 (18:28 +0000)]
Merge "Add a carrier config indicating whether user can edit a voicemail number"
Brad Ebinger [Mon, 6 Nov 2017 23:14:15 +0000 (15:14 -0800)]
Move ImsServiceProxy to opt/net/ims
This code is very tightly coupled with ImsManager
and should exist as part of the telephony IMS
code.
Test: Manual
Change-Id: If7b8ec73409daa7f1c1d27878242b4335db38e8a
Brad Ebinger [Mon, 6 Nov 2017 23:07:09 +0000 (15:07 -0800)]
Switch class hierarchy of ImsServiceProxy and compat
The compat class should be a subclass of the
ImsServiceProxy, not the other way around.
Test: Manual
Change-Id: I2a2d37edaa6b68815c99988882957bf913236f25
Adam Vartanian [Tue, 7 Nov 2017 12:22:23 +0000 (12:22 +0000)]
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
Bill Yi [Tue, 7 Nov 2017 15:14:28 +0000 (15:14 +0000)]
Import translations. DO NOT MERGE
am:
c74eab1d53 -s ours
Change-Id: I4af12be1568171456ad1b04bda161dadb0ab3152
Hugo Benichi [Fri, 13 Oct 2017 07:32:20 +0000 (16:32 +0900)]
Refactor ApfFilter creation
This patch introduces a helper ApfConfiguration class for passing filter
parameters to the constructor of ApfFilter. The benefits are:
- less parameter boilerplate across IpManager, ApfFilter, ApfTest
- easier to add more parameters in the future (useful for hardware
counters options and further gservices configurable options)
There is no functional changes otherwise.
Test: runtest frameworks-net
Change-Id: I47231c21df80bc36b6d4e15369748017b50b8da1
Bill Yi [Tue, 7 Nov 2017 06:40:03 +0000 (22:40 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I4466ce0640d6c86b975fd0290ca53b592b5d27e9
Erik Kline [Tue, 7 Nov 2017 06:12:39 +0000 (06:12 +0000)]
Merge "Replace dns_tls with private_dns_mode setting" am:
8cf645c04d
am:
f1799116c2
Change-Id: I3e0448c045eb1072d0cd70a163ca355786b21cc4
Erik Kline [Tue, 7 Nov 2017 06:03:01 +0000 (06:03 +0000)]
Merge "Replace dns_tls with private_dns_mode setting"
am:
8cf645c04d
Change-Id: I421a750561ddde0afc6a70ba6369c83ab2e33571
Treehugger Robot [Tue, 7 Nov 2017 05:54:29 +0000 (05:54 +0000)]
Merge "Replace dns_tls with private_dns_mode setting"
Neil Fuller [Tue, 7 Nov 2017 05:34:15 +0000 (05:34 +0000)]
Change SystemApi as per API council feedback
am:
a9dc4456f7
Change-Id: Iae3b822e08c49affc6a735adfe0fff1400b798eb
Neil Fuller [Fri, 11 Aug 2017 12:22:36 +0000 (13:22 +0100)]
Change SystemApi as per API council feedback
API council have requested a manifest constant be added
to the SystemApi directly in preference to an indirect
SystemApi constant here:
android.provider.TimeZoneRulesDataContract.READER_PERMISSION.
This is the first of three changes to (1) add the new constant,
(2) switch over code using the constant, (3) remove the
constant.
Bug:
64568899
Test: None, build only
Change-Id: Ib9766591979886d1db3b1d7321536dabf5cf81a8
(cherry picked from commit
8bb4140516c0e18d6c3cbb4215cedc306a2a6da9)
Erik Kline [Mon, 30 Oct 2017 06:29:44 +0000 (15:29 +0900)]
Replace dns_tls with private_dns_mode setting
Also includes:
- SettingsLib strings used in PrivateDnsModeDialogPreference
interaction in the Settings app
- rename ContentResolver "resolver" in methods working with
DNS resolvers (too confusing)
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net
- no new failures in SettingsBackupTest nor in SettingsProviderTest
- manual interaction with developer option works
Bug:
34953048
Bug:
64133961
Change-Id: Ia7502916db9ffa0792e1e500a35e34d06a88e79d
Tobias Thierer [Mon, 30 Oct 2017 20:21:38 +0000 (20:21 +0000)]
Track deprecation/replacement of Os methods that depend on Mutable*
Another CL in this CL topic is deprecating/removing three methods
in android.system.Os, and introducing replacements.
This CL tracks that change by updating frameworks/base accordingly.
Test: Treehugger
Bug:
67901714
Change-Id: I96ad205a305801b2cb641ba8984810dfe6474032
Neil Fuller [Tue, 7 Nov 2017 02:05:44 +0000 (02:05 +0000)]
Add TimeZoneRulesDataContract to system API
am:
0ab8a0d27b
Change-Id: I94ad4699cc6afb98157fe7d295e9ec502a2d7d14
Neil Fuller [Mon, 3 Jul 2017 13:38:50 +0000 (14:38 +0100)]
Add TimeZoneRulesDataContract to system API
Add TimeZoneRulesDataContract to system API and remove
TODOs to add other classes that should not now be needed
in the system API (since they are used by a platform-only
app).
Bug:
31008728
Test: make droid
Change-Id: I600e7b08853b86b27463193411cf85207ae09ce8
Jordan Liu [Tue, 7 Nov 2017 00:33:20 +0000 (00:33 +0000)]
Merge "Move isServiceReady to ImsServiceProxyCompat" am:
e158cdaaa5
am:
909a889436
Change-Id: I24c1b7009f54b20ba5231a81ecf67150f7345df1
Jordan Liu [Tue, 7 Nov 2017 00:20:00 +0000 (00:20 +0000)]
Merge "Move isServiceReady to ImsServiceProxyCompat"
am:
e158cdaaa5
Change-Id: I7ce73ab2a139b299de806f9d856544a382fe69e0
Jordan Liu [Tue, 7 Nov 2017 00:07:11 +0000 (00:07 +0000)]
Merge "Move isServiceReady to ImsServiceProxyCompat"
George Burgess IV [Mon, 6 Nov 2017 23:45:01 +0000 (23:45 +0000)]
Merge "cmds: add #!s" am:
8911c35df3
am:
2c61e3de27
Change-Id: Ifb1e12b63312570b5451b0e548adf0a5d25c4010
George Burgess IV [Mon, 6 Nov 2017 23:35:24 +0000 (23:35 +0000)]
Merge "cmds: add #!s"
am:
8911c35df3
Change-Id: Iad6d62889031046a063e6abdd0ed74143c58ba94
Treehugger Robot [Mon, 6 Nov 2017 23:25:27 +0000 (23:25 +0000)]
Merge "cmds: add #!s"
Philip P. Moltmann [Mon, 6 Nov 2017 20:58:48 +0000 (20:58 +0000)]
Merge "Allow to attach jvmti agents from inside of process" am:
faffb072a4
am:
491058e089
Change-Id: Ib636dd1ebcee0bfbd57e12e632137561bb661d3e
OSDN Git Service
