OSDN Git Service
Beverly [Tue, 19 Feb 2019 18:16:32 +0000 (10:16 -0800)]
Merge "Update keyguard charging text to indicate wireless" into pi-dev
am:
06cfb175bd
Change-Id: Ia474165d912c2090f4756108124c8a0333b31e6b
TreeHugger Robot [Tue, 19 Feb 2019 18:02:30 +0000 (18:02 +0000)]
Merge "Update keyguard charging text to indicate wireless" into pi-dev
Dario Freni [Tue, 19 Feb 2019 16:09:44 +0000 (08:09 -0800)]
Merge "Add dariofreni to APEX-related files owners." am:
9d805ba071
am:
c423836b08
Change-Id: I758e913f07aba1462375a7239ca6daadb81c3657
Dario Freni [Tue, 19 Feb 2019 15:54:42 +0000 (07:54 -0800)]
Merge "Add dariofreni to APEX-related files owners."
am:
9d805ba071
Change-Id: I13e6dda30f6aeaab8654758cd55a0166b019507c
Dario Freni [Tue, 19 Feb 2019 15:43:35 +0000 (15:43 +0000)]
Merge "Add dariofreni to APEX-related files owners."
Nicolas Geoffray [Tue, 19 Feb 2019 14:53:30 +0000 (06:53 -0800)]
Merge "Add a dalvik.vm.boot-image option for zygote and installd." am:
80e697a297
am:
f2bcd619a1
Change-Id: If5c1bbd614f5c3758f636f6a30ac93e0b64bb01d
Nicolas Geoffray [Tue, 19 Feb 2019 14:44:44 +0000 (06:44 -0800)]
Merge "Add a dalvik.vm.boot-image option for zygote and installd."
am:
80e697a297
Change-Id: Icbdf60640f0a1b5995ad09eba0bee6ed81b50c4a
Nicolas Geoffray [Tue, 19 Feb 2019 14:28:18 +0000 (14:28 +0000)]
Merge "Add a dalvik.vm.boot-image option for zygote and installd."
Dario Freni [Mon, 18 Feb 2019 17:53:24 +0000 (17:53 +0000)]
Add dariofreni to APEX-related files owners.
Test: n/a
Change-Id: I3a26033f52d98e5edcde852fff007ba33ae90856
Adam Vartanian [Tue, 19 Feb 2019 09:54:53 +0000 (01:54 -0800)]
Merge "Fix authority parsing test" am:
8ce3609e58
am:
becdd58df5
Change-Id: I41d4997661cf011e9589aedac9de301b1becb441
Adam Vartanian [Tue, 19 Feb 2019 09:44:45 +0000 (01:44 -0800)]
Merge "Fix authority parsing test"
am:
8ce3609e58
Change-Id: I8554fddceb326c52b85b34a483b3e3791abf2cdc
Adam Vartanian [Tue, 19 Feb 2019 09:27:35 +0000 (09:27 +0000)]
Merge "Fix authority parsing test"
Adam Vartanian [Mon, 18 Feb 2019 12:01:11 +0000 (12:01 +0000)]
Fix authority parsing test
The test has been failing because http://r.android.com/793302 changed
how the port separator was found, only scanning ASCII digits until it
hits a colon, and previously it would scan for the colon and then
percent-decode the rest of it. The new behavior actually better
matches the WHATWG URL parsing algorithm [1], which specifies that
ports only include ASCII digits. It does mean that some edge cases
that previously parsed as host "foo", port 42 will now parse as
host "foo:42", no port, but those URLs wouldn't be accepted by
browsers so they should be exceedingly rare.
The behavior per the WHATWG spec would be to fail to parse in the case
of a percent-encoded character in the port section, but this class is
specifically documented to accept garbage, so lumping the mis-encoded
port as part of the hostname (which will result in a hostname that's
invalid and impossible to resolve) seems like the best option.
[1] https://url.spec.whatwg.org/#port-state
Fixes:
124360078
Test: atest android.net.UriTest
Change-Id: I1c788cb7703c821ae74b542b74d89e10cba5a546
Raj Mamadgi [Tue, 19 Feb 2019 02:22:41 +0000 (18:22 -0800)]
Merge "Fix for testLifecycleOnMoveToFromSplitScreenRelaunch" am:
43d11758fa
am:
0f174795e4
Change-Id: Ie32376993dcc8b06f3d2254d6aecdb9a4f843236
Raj Mamadgi [Tue, 19 Feb 2019 02:13:45 +0000 (18:13 -0800)]
Merge "Fix for testLifecycleOnMoveToFromSplitScreenRelaunch"
am:
43d11758fa
Change-Id: I6b248297523070983c63b5dd870e235eea5ee59c
Treehugger Robot [Tue, 19 Feb 2019 02:02:35 +0000 (02:02 +0000)]
Merge "Fix for testLifecycleOnMoveToFromSplitScreenRelaunch"
David Brazdil [Mon, 18 Feb 2019 19:29:01 +0000 (11:29 -0800)]
Merge "Force blacklist on VMRuntime.setTargetSdkVersion*()" am:
da75e38817
am:
20a71e4a90
Change-Id: I07d5ec63ffcf5bda0a2cb3c2d4b0d3af0d3fdbf3
David Brazdil [Mon, 18 Feb 2019 19:18:40 +0000 (11:18 -0800)]
Merge "Force blacklist on VMRuntime.setTargetSdkVersion*()"
am:
da75e38817
Change-Id: I50ac78d0e85ab34cea2abaef4f44ee8d418e517c
Treehugger Robot [Mon, 18 Feb 2019 19:11:00 +0000 (19:11 +0000)]
Merge "Force blacklist on VMRuntime.setTargetSdkVersion*()"
Jakub Gielzak [Mon, 18 Feb 2019 18:42:20 +0000 (10:42 -0800)]
Merge "Revert "Remove legacy-test and legacy-android-test targets"" am:
049c1589ee
am:
7f997d4cfc
Change-Id: If998990b94bd36f0ffae26dede85df8ad079093e
Jakub Gielzak [Mon, 18 Feb 2019 18:32:40 +0000 (10:32 -0800)]
Merge "Revert "Remove legacy-test and legacy-android-test targets""
am:
049c1589ee
Change-Id: Ia84907bfa038954256bc791490a490dd338b33ce
Anton Hansson [Mon, 18 Feb 2019 18:26:05 +0000 (10:26 -0800)]
Merge "Specify no resource_dirs for SystemUI" am:
347d6ff9f9
am:
a05d598bc0
Change-Id: I2f2fd095a77726c62ea7f557a7ed3b5844691bf5
Jakub Gielzak [Mon, 18 Feb 2019 18:24:58 +0000 (18:24 +0000)]
Merge "Revert "Remove legacy-test and legacy-android-test targets""
Jakub Gielzak [Mon, 18 Feb 2019 18:24:17 +0000 (18:24 +0000)]
Revert "Remove legacy-test and legacy-android-test targets"
This reverts commit
3b0be60307cc6063795f8cd32356745ee371e757.
Reason for revert: Broken build
Change-Id: I71270c7b47163ab7147029f2d3961d1848fdd9eb
Anton Hansson [Mon, 18 Feb 2019 18:16:37 +0000 (10:16 -0800)]
Merge "Specify no resource_dirs for SystemUI"
am:
347d6ff9f9
Change-Id: I0b752a641e5f74d7dac1017616553f464427e219
Anton Hansson [Mon, 18 Feb 2019 18:03:36 +0000 (18:03 +0000)]
Merge "Specify no resource_dirs for SystemUI"
Paul Duffin [Mon, 18 Feb 2019 15:35:37 +0000 (07:35 -0800)]
Merge "Remove legacy-test and legacy-android-test targets" am:
14daedf747
am:
4a83feb18a
Change-Id: I920fe03eb41e0aceab8ba794bdfd53d3a5c75388
Paul Duffin [Mon, 18 Feb 2019 15:26:09 +0000 (07:26 -0800)]
Merge "Remove legacy-test and legacy-android-test targets"
am:
14daedf747
Change-Id: I67e3a6d58324affcb9119002d4fb2be23e3121fc
Jin Seok Park [Mon, 18 Feb 2019 15:15:59 +0000 (07:15 -0800)]
Merge "Add OWNERS for ExifInterface" am:
996d37ea59
am:
3250d90912
Change-Id: I96a63075aca417d269e941a84612c72575c073fd
Paul Duffin [Mon, 18 Feb 2019 15:13:45 +0000 (15:13 +0000)]
Merge "Remove legacy-test and legacy-android-test targets"
Jin Seok Park [Mon, 18 Feb 2019 15:06:53 +0000 (07:06 -0800)]
Merge "Add OWNERS for ExifInterface"
am:
996d37ea59
Change-Id: I24669310bf259344675110b2e4463894843e776b
David Brazdil [Mon, 18 Feb 2019 14:59:20 +0000 (14:59 +0000)]
Force blacklist on VMRuntime.setTargetSdkVersion*()
The methods could be used to bypass the restrictions. Force them
onto the blacklist.
Test: builds
Change-Id: I77d1fb8ca7339bec5e933f87a3b672096e2e559e
Jin Seok Park [Mon, 18 Feb 2019 14:56:06 +0000 (14:56 +0000)]
Merge "Add OWNERS for ExifInterface"
Anton Hansson [Fri, 8 Feb 2019 09:01:32 +0000 (09:01 +0000)]
Specify no resource_dirs for SystemUI
The res directory is already included via the SystemUI-core
library. The default for resource_dirs is ["res"] if it exists,
so explicitly clear it to avoid depending on it twice.
Bug:
124035856
Test: m SystemUI
Change-Id: Ia1b06cd9eff4e614684efde34288cf9ebd895870
Xiao Ma [Mon, 18 Feb 2019 07:34:55 +0000 (23:34 -0800)]
Merge "Replace TcpSocketInfo with TcpKeepalivePacketDataParcelable in ApfTest." am:
e7e5a35b38
am:
a88f901028
Change-Id: Ifcc3e24ba311b82d06ed8951f2aafd64d48272c6
Xiao Ma [Mon, 18 Feb 2019 07:25:24 +0000 (23:25 -0800)]
Merge "Replace TcpSocketInfo with TcpKeepalivePacketDataParcelable in ApfTest."
am:
e7e5a35b38
Change-Id: I555a4c49a92148a492172a4f2cec993428140cdc
Xiao Ma [Mon, 18 Feb 2019 07:12:04 +0000 (07:12 +0000)]
Merge "Replace TcpSocketInfo with TcpKeepalivePacketDataParcelable in ApfTest."
Jin Seok Park [Mon, 11 Feb 2019 08:27:09 +0000 (17:27 +0900)]
Add OWNERS for ExifInterface
Adding specific owners for ExifInterface in order to make sure
AndroidX code is changed when framework code is changed.
Bug:
122276930
Test: N/A
Change-Id: Icf0d74ad915d4b322a70c74762753411ad96bbb1
Remi NGUYEN VAN [Mon, 18 Feb 2019 01:24:51 +0000 (17:24 -0800)]
Merge "Rename NetworkStack package" am:
e4a40c77e1
am:
69728afbc7
Change-Id: I9559681cf4277a6d763245cd239f5b12a5e3865b
Remi NGUYEN VAN [Mon, 18 Feb 2019 01:15:47 +0000 (17:15 -0800)]
Merge "Rename NetworkStack package"
am:
e4a40c77e1
Change-Id: I0acdbd8716b67241367c78b7c190b72086e2db4d
Remi NGUYEN VAN [Mon, 18 Feb 2019 01:07:51 +0000 (01:07 +0000)]
Merge "Rename NetworkStack package"
Bill Yi [Sat, 16 Feb 2019 20:12:51 +0000 (12:12 -0800)]
[automerger skipped] Import translations. DO NOT MERGE
am:
8098c5f1a8 -s ours
am skip reason: subject contains skip directive
Change-Id: Iddfb5b9e9c9a5ab925a472adeaa01f50e313e518
Bill Yi [Sat, 16 Feb 2019 10:35:23 +0000 (02:35 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I225416157c786e316deb115552412a72118b9122
Ryan Mitchell [Sat, 16 Feb 2019 03:00:02 +0000 (19:00 -0800)]
Merge "Check intent action in OMS.PackageReceiver for secure coding" am:
e705e26703
am:
cb47305222
Change-Id: I147617ce86448735cc7e686f809ac9280c8e1c5b
Ryan Mitchell [Sat, 16 Feb 2019 02:50:21 +0000 (18:50 -0800)]
Merge "Check intent action in OMS.PackageReceiver for secure coding"
am:
e705e26703
Change-Id: Ic73dbe9bf5fe1f5b711ee24adbc72c1b066a63a4
Ryan Mitchell [Sat, 16 Feb 2019 02:36:41 +0000 (02:36 +0000)]
Merge "Check intent action in OMS.PackageReceiver for secure coding"
Stanley Tng [Sat, 16 Feb 2019 02:18:59 +0000 (18:18 -0800)]
[automerger skipped] Merge "Fix the bad link due to typo" am:
c0c27fbf49 -s ours
am:
cfbc249110 -s ours
am skip reason: change_id Ia06e1fffd814671289a1caebd5962aedc18a28d7 with SHA1
a44f2c075b is in history
Change-Id: I7f2044ada811da01a41e8723fc2b9dc6e181d854
Remi NGUYEN VAN [Sat, 16 Feb 2019 02:05:52 +0000 (18:05 -0800)]
Merge "Sign networkstack with its own certificate" am:
fd2d7dc685
am:
0c5872595a
Change-Id: I1cca500ca0c65ae04d0e1b99e04a15f5e11853c1
Stanley Tng [Sat, 16 Feb 2019 02:04:29 +0000 (18:04 -0800)]
[automerger skipped] Merge "Fix the bad link due to typo"
am:
c0c27fbf49 -s ours
am skip reason: change_id Ia06e1fffd814671289a1caebd5962aedc18a28d7 with SHA1
a44f2c075b is in history
Change-Id: Ib00807a7f22c339551aa750459b4a7c0398618e4
Treehugger Robot [Sat, 16 Feb 2019 01:56:30 +0000 (01:56 +0000)]
Merge "Fix the bad link due to typo"
Remi NGUYEN VAN [Sat, 16 Feb 2019 01:56:22 +0000 (17:56 -0800)]
Merge "Sign networkstack with its own certificate"
am:
fd2d7dc685
Change-Id: I24ddb16d7a163ad6141b4f6c46e5dda9f249a906
Remi NGUYEN VAN [Sat, 16 Feb 2019 01:48:49 +0000 (01:48 +0000)]
Merge "Sign networkstack with its own certificate"
Nan Zhang [Sat, 16 Feb 2019 01:07:26 +0000 (17:07 -0800)]
Merge "Fix the incorrect javadoc links" into stage-aosp-master
am:
727bc71336
Change-Id: Ib7e99be11b1b3061400f0a8a4eecb743ac6a5977
Remi NGUYEN VAN [Sat, 16 Feb 2019 00:56:43 +0000 (16:56 -0800)]
Merge "Fix framework and NetworkStack classes conflicts" am:
3f23efdd13
am:
2d7e53ca90
Change-Id: I709cb6796ed21522d264ea836daad58e987e7839
TreeHugger Robot [Sat, 16 Feb 2019 00:53:47 +0000 (00:53 +0000)]
Merge "Fix the incorrect javadoc links" into stage-aosp-master
Elliott Hughes [Sat, 16 Feb 2019 00:40:33 +0000 (16:40 -0800)]
Merge "zygote: use async signal safe log to record child process death" am:
2555ed5bca
am:
2feb04170b
Change-Id: Ic0193c6eb9471cd0e128b39e8e2fb4ff99a505b5
Remi NGUYEN VAN [Sat, 16 Feb 2019 00:38:52 +0000 (16:38 -0800)]
Merge "Fix framework and NetworkStack classes conflicts"
am:
3f23efdd13
Change-Id: I8c207040c42a3d02b8383e13a4f839c250788f58
Elliott Hughes [Sat, 16 Feb 2019 00:26:01 +0000 (16:26 -0800)]
Merge "zygote: use async signal safe log to record child process death"
am:
2555ed5bca
Change-Id: I9734da9897528cfc3b6c4b45d56eb6454ec435c8
Remi NGUYEN VAN [Sat, 16 Feb 2019 00:22:29 +0000 (00:22 +0000)]
Merge "Fix framework and NetworkStack classes conflicts"
Elliott Hughes [Sat, 16 Feb 2019 00:12:51 +0000 (00:12 +0000)]
Merge "zygote: use async signal safe log to record child process death"
Stanley Tng [Fri, 15 Feb 2019 21:13:45 +0000 (13:13 -0800)]
Fix the bad link due to typo
Replaces the link with the new API name, createInsecureL2capChannel.
Bug:
70683224
Test: Compile
Change-Id: I9580d90722f8b0c0146a902bb5fcace4ef58d421
Merged-In: Ia06e1fffd814671289a1caebd5962aedc18a28d7
Nan Zhang [Fri, 12 Oct 2018 00:54:36 +0000 (17:54 -0700)]
Fix the incorrect javadoc links
A lot of unresolved link errors showing up after go/ag/
5172152.
Test: m -j docs with -lerror enabled
Bug: b/
116163454
Change-Id: I74d1f75e0f00015410a63e13103c28a9c84b4fe0
Dichen Zhang [Fri, 15 Feb 2019 22:16:38 +0000 (14:16 -0800)]
Merge "HLS seeking: call readAt() on new thread" am:
f9d7df6f78
am:
7b459880ee
Change-Id: I47b6ca85f6956cd3b67d2fa104e313ad230c5941
Dichen Zhang [Fri, 15 Feb 2019 22:02:59 +0000 (14:02 -0800)]
Merge "HLS seeking: call readAt() on new thread"
am:
f9d7df6f78
Change-Id: Idf8a6341cdb8a2bf9478aa523e8066d96089e598
Shuo Qian [Fri, 15 Feb 2019 22:01:51 +0000 (14:01 -0800)]
Merge "Populate 'hasKnownUserIntentEmergency'" am:
59d8275546
am:
b75330904e
Change-Id: I657738047be85983dd633322ac5abe8d48b32f44
Dichen Zhang [Fri, 15 Feb 2019 21:47:26 +0000 (21:47 +0000)]
Merge "HLS seeking: call readAt() on new thread"
Shuo Qian [Fri, 15 Feb 2019 21:43:51 +0000 (13:43 -0800)]
Merge "Populate 'hasKnownUserIntentEmergency'"
am:
59d8275546
Change-Id: If7167ecae8c4de2cfb3a8032beb350fe1e327f32
Max Bires [Fri, 15 Feb 2019 21:43:33 +0000 (13:43 -0800)]
Merge "Adding framework check for 3DES key size" am:
a24d025212
am:
a68009941a
Change-Id: I53ab760b016544c0586a4d19a3e924ae899ae12e
Max Bires [Fri, 15 Feb 2019 21:32:51 +0000 (13:32 -0800)]
Merge "Adding framework check for 3DES key size"
am:
a24d025212
Change-Id: Id71784688902c0fc1d490b1fd8321fae134166b5
Shuo Qian [Fri, 15 Feb 2019 21:23:52 +0000 (21:23 +0000)]
Merge "Populate 'hasKnownUserIntentEmergency'"
Treehugger Robot [Fri, 15 Feb 2019 21:12:29 +0000 (21:12 +0000)]
Merge "Adding framework check for 3DES key size"
Beverly [Mon, 11 Feb 2019 18:58:27 +0000 (13:58 -0500)]
Update keyguard charging text to indicate wireless
- Keyguard charging text indicates the device is wirelessly charging
Test: manual
Change-Id: I9cce8ecaf07f8870164d9ef8a569fcf30db69d85
Merged-in: I9cce8ecaf07f8870164d9ef8a569fcf30db69d85
Fixes:
124084552
Jeff Sharkey [Fri, 15 Feb 2019 19:08:21 +0000 (11:08 -0800)]
Merge "No-op flag to keep tests working in this branch." am:
2144164526
am:
d6b5de96c2
Change-Id: I4da35d7b8273c20fe625ea79fb135e4d59648e72
Leland Miller [Fri, 15 Feb 2019 18:48:00 +0000 (10:48 -0800)]
Merge "Move RCS table creation flag to contract class" am:
0c8bc10ab2
am:
122d78ddac
Change-Id: I4431919630371ee77deefce037ce0f7bb7f1a503
Jeff Sharkey [Fri, 15 Feb 2019 18:46:35 +0000 (10:46 -0800)]
Merge "No-op flag to keep tests working in this branch."
am:
2144164526
Change-Id: I7723ff61f7c0f6f5f0bf560b2baa16ffda85dffb
Todd Kennedy [Fri, 15 Feb 2019 18:39:48 +0000 (10:39 -0800)]
Merge "Add new file to owners" am:
eda6f2401f
am:
6008c060c5
Change-Id: I45aae1ec1a784feead0f7d02f1f1fe94d5ec16b7
Leland Miller [Fri, 15 Feb 2019 18:37:18 +0000 (10:37 -0800)]
Merge "Move RCS table creation flag to contract class"
am:
0c8bc10ab2
Change-Id: I81f0a24320171fee4d20b661c08d8144e84df181
Jeff Sharkey [Fri, 15 Feb 2019 18:34:31 +0000 (18:34 +0000)]
Merge "No-op flag to keep tests working in this branch."
Christian Wailes [Fri, 15 Feb 2019 18:31:42 +0000 (10:31 -0800)]
Merge "Fix loop iteration bug." am:
1a74681173
am:
db80339f95
Change-Id: I7f95ec816b3e0e54e9c662da550f931e160ab54b
Todd Kennedy [Fri, 15 Feb 2019 18:28:55 +0000 (10:28 -0800)]
Merge "Add new file to owners"
am:
eda6f2401f
Change-Id: I7e8296b1af33739ce906e53efd586ed7d6d98cca
Christian Wailes [Fri, 15 Feb 2019 18:24:31 +0000 (10:24 -0800)]
Merge "Fix loop iteration bug."
am:
1a74681173
Change-Id: I0f01f27d328b242cf8c102bbfe70324d9d263ce9
Leland Miller [Fri, 15 Feb 2019 18:16:12 +0000 (18:16 +0000)]
Merge "Move RCS table creation flag to contract class"
Todd Kennedy [Fri, 15 Feb 2019 18:10:49 +0000 (18:10 +0000)]
Merge "Add new file to owners"
Christian Wailes [Fri, 15 Feb 2019 18:09:03 +0000 (18:09 +0000)]
Merge "Fix loop iteration bug."
Abodunrinwa Toki [Fri, 15 Feb 2019 17:26:07 +0000 (09:26 -0800)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Close TextClassifier native resources." into pi-dev
am:
d14c8a2a72 -s ours
am skip reason: SHA1
d14c8a2a72 skipped by user tonymak
Change-Id: I584c8a67270606cd893a980617c60981f37bc1c7
Jeff Sharkey [Fri, 15 Feb 2019 16:49:15 +0000 (09:49 -0700)]
No-op flag to keep tests working in this branch.
Bug:
124507818
Test: manual
Change-Id: I65ae1a55c420690e68f833674d4d09452a826302
Merged-In: I7973b123cf4fc08e8ce2b05bd4c23fa41b1cdcdf
Todd Kennedy [Fri, 15 Feb 2019 12:55:32 +0000 (04:55 -0800)]
Add new file to owners
Test: None
Change-Id: I69f415929785845ede8f2d1341f4b70f97b4f480
Varun Anand [Fri, 15 Feb 2019 11:54:28 +0000 (03:54 -0800)]
Merge "Update VPN capabilities when its underlying network set is null." am:
e3ae238f4a
am:
d6d593572e
Change-Id: I832cbc4646c010add5a4f051d3f7151cfc94120c
Varun Anand [Fri, 15 Feb 2019 11:45:03 +0000 (03:45 -0800)]
Merge "Update VPN capabilities when its underlying network set is null."
am:
e3ae238f4a
Change-Id: Id4560d201a40f5e1b1617819991da99d86379dbe
Treehugger Robot [Fri, 15 Feb 2019 11:33:27 +0000 (11:33 +0000)]
Merge "Update VPN capabilities when its underlying network set is null."
Remi NGUYEN VAN [Fri, 15 Feb 2019 11:10:18 +0000 (03:10 -0800)]
Merge "Move NetworkStack to services.net" am:
762f9f0c24
am:
51490ad0fa
Change-Id: I6a0ddc23bf95039d9d51a4fde9dd87d2f5bf71ee
Remi NGUYEN VAN [Fri, 15 Feb 2019 11:01:11 +0000 (03:01 -0800)]
Merge "Move NetworkStack to services.net"
am:
762f9f0c24
Change-Id: Iab45985aedb8069ad50fd2913ef6e828989cdd0d
Remi NGUYEN VAN [Fri, 15 Feb 2019 10:52:03 +0000 (10:52 +0000)]
Merge "Move NetworkStack to services.net"
Xiao Ma [Fri, 15 Feb 2019 10:18:21 +0000 (19:18 +0900)]
Replace TcpSocketInfo with TcpKeepalivePacketDataParcelable in ApfTest.
Test: atest NetworkStackTests
Change-Id: I95fde70c07b398a2a2f734f35165870284a3959c
Paul Duffin [Thu, 14 Feb 2019 12:52:50 +0000 (12:52 +0000)]
Remove legacy-test and legacy-android-test targets
Fixes up the android.test.legacy target to stop using sources directly
now that the issue with android.test.runner-minus-junit not being able
to be built against the SDK has been resolved.
Also, fixes a couple of comments.
Bug:
63127064
Test: make checkbuild
Change-Id: If38fa0d87b36343896e97efb2269ac070810db84
Remi NGUYEN VAN [Fri, 15 Feb 2019 08:45:03 +0000 (17:45 +0900)]
Sign networkstack with its own certificate
The NetworkStack module is comprised of 2 updatable APKs
(NetworkStack.apk and CaptivePortalLogin.apk), and a stub APK to define
the signature permissions for the APKs (NetworkStackPermissionStub.apk).
Test: flashed, WiFi works, captive portal login works
Bug:
124033493
Change-Id: I772d1d63363a3eb6f817c21906498bd2385ab02b
Remi NGUYEN VAN [Fri, 15 Feb 2019 08:42:02 +0000 (00:42 -0800)]
Merge "Add NetworkStackTests to device-tests suite" am:
d989ed753d
am:
8878aec7b7
Change-Id: I561d90036c6600f1fc9f2ef9e8f22e9e8a330e9e
Remi NGUYEN VAN [Fri, 15 Feb 2019 08:34:13 +0000 (00:34 -0800)]
Merge "Remove NetworkMonitor dependency on ICaptivePortal" am:
bfe928d593
am:
8a4908c1ab
Change-Id: I60c67a42bce60615f7e0ce86aaafac4fbff19795
Remi NGUYEN VAN [Fri, 15 Feb 2019 08:30:39 +0000 (00:30 -0800)]
Merge "Add NetworkStackTests to device-tests suite"
am:
d989ed753d
Change-Id: Id965eaf17cc0f4a042adb5df7387f3326451cd4f
Remi NGUYEN VAN [Thu, 14 Feb 2019 09:19:14 +0000 (18:19 +0900)]
Fix framework and NetworkStack classes conflicts
Classes that are used in framework.jar cannot be linked in NetworkStack,
as the framework takes precedence in the classpath. This prevents the
networkstack from using these classes due to the hidden API usage
detection.
Do the following:
- jarjar any shared source file between framework and NetworkStack, so
the version in the NetworkStack uses a different package.
- Move any shared class not used in the NetworkStack to services.net
The CL uses jarjar on the app copy and not the framework classes, as
the framework cannot be updated without an OTA, and non-network stack
specific classes should not be renamed because of the network stack.
Test: atest FrameworksNetTests NetworkStackTests
Test: flashed svelte build, WiFi works
Bug:
124033493
Change-Id: I85d888b756adc28c36638913632bfdfdbf0e0486
OSDN Git Service
