Xin Li
91c9ec0c73
[automerger skipped] Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master" into stage-aosp-master am: fd24099616
...
am: 65dad1faa9 -s ours
am skip reason: subject contains skip directive
Change-Id: I5737c9310055502c4736dd58b38137e4119be833
2019-10-31 14:56:47 -07:00
Xin Li
65dad1faa9
Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master" into stage-aosp-master
...
am: fd24099616
Change-Id: I3a1d6dd3aefe1720f7b77174287357446626d1dd
2019-10-31 14:33:39 -07:00
Xin Li
65c589a1bd
[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 25d140454e
...
am: 42d2b7d42e -s ours
am skip reason: subject contains skip directive
Change-Id: I3056dd82f558502b57da97eca4524d5332f3ae5f
2019-10-31 14:02:53 -07:00
Xin Li
42d2b7d42e
DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
...
am: 25d140454e
Change-Id: I80dc833d1a9394dc61a09296a9dbad604c3c0a0d
2019-10-31 13:15:28 -07:00
TreeHugger Robot
fd24099616
Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master" into stage-aosp-master
2019-10-31 18:38:40 +00:00
Jeongik Cha
ae75aea69a
[automerger skipped] Merge "Change AIDL module name" am: 450a38b074 am: 432fb0358b
...
am: f05bf24a74 -s ours
am skip reason: change_id Ib38e2cb114cc373ef50652f421ddaff9b4fbe5b9 with SHA1 fbfa7d09ff is in history
Change-Id: I70e0b81df88d09dd10f236b443cde0b4b3c52a0e
2019-10-31 00:12:31 -07:00
Jeongik Cha
f05bf24a74
Merge "Change AIDL module name" am: 450a38b074
...
am: 432fb0358b
Change-Id: Ib67d2e7f95592b2b94b43001f89a9413ff01dfcd
2019-10-31 00:00:11 -07:00
Xin Li
25d140454e
DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
...
Bug: 142003500
Change-Id: If5056a73ede668b0048ca107b686413695e5b3b6
2019-10-30 14:33:01 -07:00
Remi NGUYEN VAN
c598529450
Add permissions to NetIntegrationTests manifest
...
As the TestNetworkStack target is updated not to use the complete
NetworkStackManifest to avoid including priv-app permissions and actual
service names, the missing permissions must be added to the
FrameworksNetIntegrationTests manifest.
Add the permissions and attributes that are necessary for the test, and
used to be merged from the TestNetworkStack library manifest.
Test: atest FrameworksNetIntegrationTests
Change-Id: I8b434e67f3a6c9141da71c6dfab1be77aa0f8411
2019-10-30 18:30:03 +09:00
Jeongik Cha
122535bedc
Change AIDL module name
...
Naming rule for aidl module is changed to make using unstable AIDL module more explicit
So, to use unstable version AIDL module, use "-unstable" suffix version
And also, module name without any suffix means latest frozen version.
But wrt modules for C++ and NDK, module name with latest frozen version
is not available for now.
In b/139280289, more background is explained
Test: m
Bug: 139280289
Change-Id: Ib38e2cb114cc373ef50652f421ddaff9b4fbe5b9
Merged-In: Ib38e2cb114cc373ef50652f421ddaff9b4fbe5b9
2019-10-29 16:01:18 +09:00
Jeongik Cha
fbfa7d09ff
Change AIDL module name
...
Naming rule for aidl module is changed to make using unstable AIDL module more explicit
So, to use unstable version AIDL module, use "-unstable" suffix version
And also, module name without any suffix means latest frozen version.
But wrt modules for C++ and NDK, module name with latest frozen version
is not available for now.
In b/139280289, more background is explained
Test: m
Bug: 139280289
Change-Id: Ib38e2cb114cc373ef50652f421ddaff9b4fbe5b9
2019-10-26 00:38:46 +09:00
Mark Chien
570bb5574c
Merge "[Tether02] Migrate TetheringConfiguration into module" am: adef7395e8 am: 68e38feeda am: efd1966341
...
am: 4f9e0501d4
Change-Id: Ia361893223c5d08e7ca0193c38f9b1b88a330320
2019-10-24 07:14:21 -07:00
Mark Chien
4f9e0501d4
Merge "[Tether02] Migrate TetheringConfiguration into module" am: adef7395e8 am: 68e38feeda
...
am: efd1966341
Change-Id: Ifbcc8a81d4ea7521f0d3ae56e0951974b9355334
2019-10-24 07:07:35 -07:00
Mark Chien
efd1966341
Merge "[Tether02] Migrate TetheringConfiguration into module" am: adef7395e8
...
am: 68e38feeda
Change-Id: Iacc50625daa999203aa104bf270e1295592240aa
2019-10-24 06:51:38 -07:00
Mark Chien
68e38feeda
Merge "[Tether02] Migrate TetheringConfiguration into module"
...
am: adef7395e8
Change-Id: I8fa812a78f61976741bc06ccf4000f625b75ecbe
2019-10-24 06:38:24 -07:00
Mark Chien
adef7395e8
Merge "[Tether02] Migrate TetheringConfiguration into module"
2019-10-24 13:10:24 +00:00
markchien
e5593f3381
[Tether02] Migrate TetheringConfiguration into module
...
TetheringConfiguration is a utility class to encapsulate the various
configuration elements.
Bug: 136040414
Test: -build, flash, boot
-atest TetheringTests
Change-Id: I9434ab213bc5e0fca59f14a6c8cea554abefc3a4
2019-10-24 14:00:05 +08:00
Lucas Lin
665edc1896
Merge "Better notification to user when DNS-over-TLS is broken" am: f42f3830ec am: 6a78c78996 am: e2bb0da748
...
am: d72606c43d
Change-Id: Iffbdc181d8249f26b3c370474583673aaa1c5032
2019-10-23 03:27:05 -07:00
Lucas Lin
d72606c43d
Merge "Better notification to user when DNS-over-TLS is broken" am: f42f3830ec am: 6a78c78996
...
am: e2bb0da748
Change-Id: I9d840678b1612c89b7917e8eece0c920326a83a0
2019-10-23 03:20:21 -07:00
Lucas Lin
e2bb0da748
Merge "Better notification to user when DNS-over-TLS is broken" am: f42f3830ec
...
am: 6a78c78996
Change-Id: I2d257ced3460985be3980d122496232de73d18b3
2019-10-23 03:07:15 -07:00
Lucas Lin
6a78c78996
Merge "Better notification to user when DNS-over-TLS is broken"
...
am: f42f3830ec
Change-Id: I8be963e35ed5e5ba914c6d3504a52ccb789aaf29
2019-10-23 02:51:56 -07:00
Lucas Lin
f42f3830ec
Merge "Better notification to user when DNS-over-TLS is broken"
2019-10-23 09:20:09 +00:00
lucaslin
e117e2e8d7
Better notification to user when DNS-over-TLS is broken
...
Provide a specifc notification to let users know that device
has no internet is because it really doesn't have internet access
or it's caused by private DNS resolution failed.
Bug: 113242081
Test: atest FrameworksNetTests
Change-Id: I710c88a4742f5fd56c39fc797d7fa3ad36dba553
2019-10-22 18:27:33 +08:00
Martin Stjernholm
435eaf673c
Merge "Remove unnecessary dependencies on ART internal libraries." am: 6bc5580fe0 am: 36a45001fe am: 60da9bfd80
...
am: f3aad777c4
Change-Id: Ief1fda0e7bc6da454d24e49853f260d3a1989e50
2019-10-19 06:02:55 -07:00
Martin Stjernholm
f3aad777c4
Merge "Remove unnecessary dependencies on ART internal libraries." am: 6bc5580fe0 am: 36a45001fe
...
am: 60da9bfd80
Change-Id: Idbc8ca12eab74729f5c889174fedc1651ee1b13a
2019-10-19 05:51:19 -07:00
Martin Stjernholm
60da9bfd80
Merge "Remove unnecessary dependencies on ART internal libraries." am: 6bc5580fe0
...
am: 36a45001fe
Change-Id: I0cfcf30c8be58a8307a87349924d45c0d9970cc8
2019-10-19 05:44:28 -07:00
Martin Stjernholm
36a45001fe
Merge "Remove unnecessary dependencies on ART internal libraries."
...
am: 6bc5580fe0
Change-Id: I41e9126d946bd347096fe8dce4887e9a2c67fe95
2019-10-19 05:38:36 -07:00
Treehugger Robot
6bc5580fe0
Merge "Remove unnecessary dependencies on ART internal libraries."
2019-10-19 12:20:47 +00:00
Jimmy Chen
045387d492
Merge "p2p: mirgrate p2p into tethering modes" am: baf9025bbf am: fbb3f48d47 am: 2afadcb2e6
...
am: e41f14ad98
Change-Id: I069022ca21c0a09ac2eab1b97436223df99a3b1b
2019-10-17 23:25:44 -07:00
Jimmy Chen
e41f14ad98
Merge "p2p: mirgrate p2p into tethering modes" am: baf9025bbf am: fbb3f48d47
...
am: 2afadcb2e6
Change-Id: Ida50dff8604243871d3f93258ea75b45ae25877c
2019-10-17 23:19:13 -07:00
Jimmy Chen
2afadcb2e6
Merge "p2p: mirgrate p2p into tethering modes" am: baf9025bbf
...
am: fbb3f48d47
Change-Id: I618c950426976dd1899284d0c249ea7b4e45b479
2019-10-17 23:12:30 -07:00
Jimmy Chen
fbb3f48d47
Merge "p2p: mirgrate p2p into tethering modes"
...
am: baf9025bbf
Change-Id: Ib8f43d77a5f57965fa217e6e92eb9773e7914b54
2019-10-17 23:06:04 -07:00
Jimmy Chen
baf9025bbf
Merge "p2p: mirgrate p2p into tethering modes"
2019-10-18 05:42:31 +00:00
Aaron Huang
b528016147
Merge "Expose MacAddress methods to public API" am: db4e0d3bcf am: 1d06e0b1fb am: e0cd0f25ac
...
am: 5ba0a7e727
Change-Id: Ie117595096175ddb0affaa36d5f287a533e99eb5
2019-10-17 21:20:51 -07:00
Aaron Huang
5ba0a7e727
Merge "Expose MacAddress methods to public API" am: db4e0d3bcf am: 1d06e0b1fb
...
am: e0cd0f25ac
Change-Id: I98471c410f483ad9d1ec1602c27bf4a21df305de
2019-10-17 21:14:08 -07:00
Aaron Huang
e0cd0f25ac
Merge "Expose MacAddress methods to public API" am: db4e0d3bcf
...
am: 1d06e0b1fb
Change-Id: I1baaf191006cf6fb9fb1e718a755bb829f1cc899
2019-10-17 21:07:13 -07:00
Aaron Huang
1d06e0b1fb
Merge "Expose MacAddress methods to public API"
...
am: db4e0d3bcf
Change-Id: I98c2104fe5307e916bd2026eb943bfe4a9913d07
2019-10-17 20:55:36 -07:00
Aaron Huang
db4e0d3bcf
Merge "Expose MacAddress methods to public API"
2019-10-18 03:45:40 +00:00
Martin Stjernholm
6d932e39fd
Remove unnecessary dependencies on ART internal libraries.
...
Bug: 133140750
Test: atest FrameworksNetTests
Change-Id: Id6817a2ae09eb6ecfc4c5c8dc08ade44a16d710b
2019-10-17 23:29:57 +01:00
Lucas Lin
1b3a74ce3d
Merge "Remove the network capabilities which are added twice" am: 931234b451 am: 210db2b411 am: 1e53cc62bb
...
am: 5459cb0f7f
Change-Id: I4868e49b461a0e1990827acdcdd29279b988bd34
2019-10-15 22:09:26 -07:00
Lucas Lin
5459cb0f7f
Merge "Remove the network capabilities which are added twice" am: 931234b451 am: 210db2b411
...
am: 1e53cc62bb
Change-Id: Ifea6d9380bfbfeb3ca5a35874c51fd1f5fdef6b0
2019-10-15 21:52:23 -07:00
Lucas Lin
1e53cc62bb
Merge "Remove the network capabilities which are added twice" am: 931234b451
...
am: 210db2b411
Change-Id: Iad8268118899d21bf665d64b61e1cb1c4f49ca7e
2019-10-15 21:41:47 -07:00
Lucas Lin
210db2b411
Merge "Remove the network capabilities which are added twice"
...
am: 931234b451
Change-Id: I884dd7720ef9ccf257dc49de11a24918c00fa0ca
2019-10-15 21:23:48 -07:00
Aaron Huang
10b90974ac
Expose MacAddress methods to public API
...
To support mainline modules, adding the methods which
are used by wifi.
Bug: 139268426
Bug: 135998869
Bug: 138306002
Test: atest android.net.cts
atest android.net.wifi.cts
atest FrameworksNetTests
atest NetworkStackTests
./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: I49856863c15b6b3b59aa867a77b0f137003149ef
2019-10-15 17:33:05 +08:00
lucaslin
08459a6a7d
Remove the network capabilities which are added twice
...
Remove the network capabilities which are added twice in
createDefaultNetworkCapabilitiesForUid() and
createDefaultInternetRequestForTransport(). In the constructor
of NetworkCapabilities, it will add the DEFAULT_CAPABILITIES
which includes the NOT_RESTRICTED.
Bug: 142370233
Test: 1. Build pass.
2. atest FrameworksNetTests
Change-Id: I7159909aec8faa7f25cef94195bdaea0fea55840
2019-10-15 17:13:45 +08:00
paulhu
66feecf4a5
Merge "Remove @FlakyTest on testTcpBufferReset" am: 3ae017a7d2 am: 5288706a9e am: fe4c5bd059
...
am: 2852e64a9f
Change-Id: I41e30d81907e8a651d9bb982045276910944a4c2
2019-10-11 05:07:09 -07:00
paulhu
2852e64a9f
Merge "Remove @FlakyTest on testTcpBufferReset" am: 3ae017a7d2 am: 5288706a9e
...
am: fe4c5bd059
Change-Id: I6088b8efa800e2ef4d8b796832adcf9d52cc2e5b
2019-10-11 04:51:09 -07:00
paulhu
fe4c5bd059
Merge "Remove @FlakyTest on testTcpBufferReset" am: 3ae017a7d2
...
am: 5288706a9e
Change-Id: I9d0f281003913f6bfe4ee31f654df8909f6d9c6a
2019-10-11 04:39:06 -07:00
paulhu
5288706a9e
Merge "Remove @FlakyTest on testTcpBufferReset"
...
am: 3ae017a7d2
Change-Id: I3078d75cdc1ec6a1ddbd10de60cb6d355fe5f317
2019-10-11 04:26:47 -07:00
Treehugger Robot
3ae017a7d2
Merge "Remove @FlakyTest on testTcpBufferReset"
2019-10-11 11:06:14 +00:00