Commit Graph

6982 Commits

Author SHA1 Message Date
Chalard Jean
63c8c0c23d [automerger skipped] Let clients access StaticIpConfiguration members through reflection. am: 6f1f2df72b am: a331899d92 -s ours
am: 9fe637516d -s ours
am skip reason: change_id I0fa84390f6c289571afa9d86cb922835fe2b7e77 with SHA1 b4368bed5a is in history

Change-Id: I1c8e0e617f1c4c02970fc349d6adad2089c869da
2019-05-23 11:20:55 -07:00
Chalard Jean
a93d51b0ca Merge "Update throws documentation for requestNetwork*" am: bfcbf4b450 am: 411f1efc02 am: 884b5f480e
am: 195b1e86a5

Change-Id: I601fcfc94071dd57c867af11087698784fab94f5
2019-05-23 10:27:15 -07:00
Chalard Jean
fb5cf9644f Merge "Let clients access StaticIpConfiguration members through reflection." am: 65663acf34 am: 892038673e am: 93f36d6d7e
am: 31e8e20db4

Change-Id: I88b0235ff4ccb0091b0a1d11aa109fc631d5a063
2019-05-23 10:10:13 -07:00
Lorenzo Colitti
7e0b85ae5c Merge "Merge "Merge "Properly use versioned interfaces." am: 9572afce76 am: b92fbe0435" into qt-dev-plus-aosp am: 5b992330bb" into qt-r1-dev-plus-aosp
am: b010e1210b

Change-Id: Id816e44f87d644e2c8b0e41b860fac7fd4305fed
2019-05-23 03:48:36 -07:00
Chalard Jean
9fe637516d [automerger skipped] Let clients access StaticIpConfiguration members through reflection. am: 6f1f2df72b
am: a331899d92 -s ours
am skip reason: change_id I0fa84390f6c289571afa9d86cb922835fe2b7e77 with SHA1 b4368bed5a is in history

Change-Id: I7205437009d8c7b9e6052b3337df466be020f224
2019-05-22 11:25:56 -07:00
Chalard Jean
195b1e86a5 Merge "Update throws documentation for requestNetwork*" am: bfcbf4b450 am: 411f1efc02
am: 884b5f480e

Change-Id: I3e5e35c2bcd84c02bd093c30ac5c184608f798f4
2019-05-22 08:11:27 -07:00
Chalard Jean
31e8e20db4 Merge "Let clients access StaticIpConfiguration members through reflection." am: 65663acf34 am: 892038673e
am: 93f36d6d7e

Change-Id: I77562c577b704a979a9df0125cb63143a47cacb1
2019-05-22 07:57:32 -07:00
Lorenzo Colitti
95c5c024c0 Merge "Merge "Properly use versioned interfaces." am: 9572afce76 am: b92fbe0435" into qt-dev-plus-aosp
am: 5b992330bb

Change-Id: I45ae2c177daf99474bf8232aa4379521b363bd1b
2019-05-22 06:24:56 -07:00
Chalard Jean
6f1f2df72b Let clients access StaticIpConfiguration members through reflection.
Bug: 131764329
Test: none
Change-Id: Ice5c4fd4d469a55410129310c5a25874b94e2219
(cherry picked from commit 6736fb0465e3cc9f38ee1340e6b831a6dcd195e8)
Merged-In: I0fa84390f6c289571afa9d86cb922835fe2b7e77
2019-05-22 12:01:31 +00:00
Chalard Jean
884b5f480e Merge "Update throws documentation for requestNetwork*" am: bfcbf4b450
am: 411f1efc02

Change-Id: Iaabcc52b3e6537752990b88a24e11217f73ce8e7
2019-05-22 02:55:10 -07:00
Chalard Jean
93f36d6d7e Merge "Let clients access StaticIpConfiguration members through reflection." am: 65663acf34
am: 892038673e

Change-Id: Ice5c4fd4d469a55410129310c5a25874b94e2219
2019-05-22 02:42:25 -07:00
Chalard Jean
bfcbf4b450 Merge "Update throws documentation for requestNetwork*" 2019-05-22 08:34:43 +00:00
Lorenzo Colitti
91ddb23d66 Merge "Properly use versioned interfaces." am: 9572afce76
am: b92fbe0435

Change-Id: Idf49e840263ef32b9ee4fafa6718d4f893ea7c87
2019-05-22 01:20:45 -07:00
Chalard Jean
65663acf34 Merge "Let clients access StaticIpConfiguration members through reflection." 2019-05-22 07:17:52 +00:00
Lorenzo Colitti
4b56771878 Properly use versioned interfaces.
Our stable AIDL interfaces need to use versioned build targets,
otherwise getVersion will always return 0, which makes it
impossible to support different components at different versions.

List generated with:
find . -name Android.bp -exec egrep \
    -H "(netd|dnsresolver|ipmemorystore|networkstack).aidl.interface(s?)-(java|cpp)" {} \;

Bug: 133124190
Test: m
Change-Id: Id175c99daa77507847673777a8dcce51897ab17b
2019-05-22 03:12:59 +00:00
junyulai
8ed310046e Merge "Move keepalive constants to their right place" am: ac6f142334 am: 292f73b0dc am: 0121a21ff7
am: fea03925fd

Change-Id: I40558c59b353d8b158bbe467bc81922cdf822663
2019-05-21 05:41:00 -07:00
junyulai
fea03925fd Merge "Move keepalive constants to their right place" am: ac6f142334 am: 292f73b0dc
am: 0121a21ff7

Change-Id: I4dcbf65c8b778815eef748ee348c928a258d40e0
2019-05-20 22:57:54 -07:00
junyulai
0121a21ff7 Merge "Move keepalive constants to their right place" am: ac6f142334
am: 292f73b0dc

Change-Id: Id45981af5b42ec1423aff8b0ec1bc07d7c71c6b9
2019-05-20 22:09:19 -07:00
Treehugger Robot
ac6f142334 Merge "Move keepalive constants to their right place" 2019-05-21 02:01:30 +00:00
junyulai
654be392b6 Move keepalive constants to their right place
The constants CMD_{ADD,REMOVE}_KEEPALIVE_PACKET_FILTER are too
high in the file and not in order. These constants should be
moved back to their rightful place.

Bug: 123987395
Test: 1. m -j 2. m -j doc-comment-check-docs
Change-Id: I44c827d3a2011cf7c66c0444566e14192fec1b1b
2019-05-21 00:23:41 +00:00
Chalard Jean
b4368bed5a Let clients access StaticIpConfiguration members through reflection.
Bug: 131764329
Test: none
Change-Id: I0fa84390f6c289571afa9d86cb922835fe2b7e77
2019-05-20 16:58:08 +09:00
Remi NGUYEN VAN
863c7ff8ea [automerger skipped] Merge "Reland: Add FrameworksNetTests dependency on libcgrouprc" am: 909e72a9e4 am: e8ceef0220 -s ours am: d10d49aa4d -s ours
am: 779642197d -s ours
am skip reason: change_id If9c8aa41c4e96a79b71c88f199a4f3b0483e31cd with SHA1 5e44e5fafc is in history

Change-Id: Ie3ea29c8ccd1126ec99a1de39935a1cd9c872cf8
2019-05-17 17:31:03 -07:00
Lorenzo Colitti
1c216318df Merge "[automerger skipped] Merge "Change the icon for the LOGGED_IN notification." into qt-dev am: 38254b8bd7 am: c0b843372b -s ours
am: d3c11c7454 -s ours
am skip reason: change_id I8250236bc4ba251492a6cb9bf23e67666ef860d3 with SHA1 b45f7ad98b is in history

Change-Id: I984a7f40ed24dc172807e2ccaab10c4f4ff32d79
2019-05-17 17:22:50 -07:00
Lorenzo Colitti
b1f9ae65d4 [automerger skipped] Merge "Change the icon for the LOGGED_IN notification." into qt-dev am: 38254b8bd7 -s ours am: 7f7ad61c24 -s ours
am: 8a610f44dd -s ours
am skip reason: change_id I8250236bc4ba251492a6cb9bf23e67666ef860d3 with SHA1 b45f7ad98b is in history

Change-Id: I6172d983d2717db50d420b344f16d8d3b9e435b9
2019-05-17 17:14:33 -07:00
Paul Hu
f78a8cabb9 [automerger skipped] Merge "Ignore NetworkTest when running CtsNetTestCases in instant app mode" into qt-dev am: b725fc0059 -s ours am: 361b17feba -s ours
am: 9c4b812c01 -s ours
am skip reason: change_id Ia28eea113e19b9c44998677e5b8093be178a06a3 with SHA1 bea628fb59 is in history

Change-Id: I26af5b26a21050253834dbc7e47f887d336bdef2
2019-05-17 15:56:32 -07:00
Lorenzo Colitti
92e314d92c Merge "Change the icon for the LOGGED_IN notification." am: 2c3f94e392 am: fce3635550 am: c67e20d59c
am: d663a3ba0a

Change-Id: I4012c9df9dd740af620003aef4e69d839549fed9
2019-05-17 15:49:39 -07:00
Paul Hu
930749ace6 [automerger skipped] Merge "Ignore NetworkTest when running CtsNetTestCases in instant app mode" into qt-dev am: b725fc0059 am: b200928ed4 -s ours
am: 061a8ddb77 -s ours
am skip reason: change_id Ia28eea113e19b9c44998677e5b8093be178a06a3 with SHA1 bea628fb59 is in history

Change-Id: I4c26ebf6630baf255d861e5fa4d2410de3658395
2019-05-17 15:33:29 -07:00
Xin Li
7abf22a015 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: 8f33552b32 -s ours am: 704e63b17e -s ours am: b7496ba841
am: f23b29e0dd -s ours
am skip reason: subject contains skip directive

Change-Id: I9dbd552f229601b95fa8338da70f28fb5c76e861
2019-05-17 11:42:11 -07:00
Remi NGUYEN VAN
779642197d [automerger skipped] Merge "Reland: Add FrameworksNetTests dependency on libcgrouprc" am: 909e72a9e4 am: e8ceef0220 -s ours
am: d10d49aa4d -s ours
am skip reason: change_id If9c8aa41c4e96a79b71c88f199a4f3b0483e31cd with SHA1 5e44e5fafc is in history

Change-Id: I9eff349b9d879aa84d8bb096ec895a749e138ca8
2019-05-17 08:12:01 -07:00
Remi NGUYEN VAN
d10d49aa4d [automerger skipped] Merge "Reland: Add FrameworksNetTests dependency on libcgrouprc" am: 909e72a9e4
am: e8ceef0220 -s ours
am skip reason: change_id If9c8aa41c4e96a79b71c88f199a4f3b0483e31cd with SHA1 5e44e5fafc is in history

Change-Id: Ia14d1971aaed3d2badf5d9c037133e8a12e16bfa
2019-05-17 08:00:52 -07:00
Android Build Merger (Role)
d3c11c7454 Merge "[automerger skipped] Merge "Change the icon for the LOGGED_IN notification." into qt-dev am: 38254b8bd7 am: c0b843372b -s ours am skip reason: change_id I8250236bc4ba251492a6cb9bf23e67666ef860d3 with SHA1 b45f7ad98b is in history" into qt-r1-dev-plus-aosp 2019-05-17 14:26:33 +00:00
Lorenzo Colitti
8a610f44dd [automerger skipped] Merge "Change the icon for the LOGGED_IN notification." into qt-dev am: 38254b8bd7 -s ours
am: 7f7ad61c24 -s ours
am skip reason: change_id I8250236bc4ba251492a6cb9bf23e67666ef860d3 with SHA1 b45f7ad98b is in history

Change-Id: I26f49751773bc8bc0d728f73c9fed6b1eda6dbb8
2019-05-17 07:25:57 -07:00
Lorenzo Colitti
f1dc853c0e [automerger skipped] Merge "Change the icon for the LOGGED_IN notification." into qt-dev am: 38254b8bd7
am: c0b843372b -s ours
am skip reason: change_id I8250236bc4ba251492a6cb9bf23e67666ef860d3 with SHA1 b45f7ad98b is in history

Change-Id: I6951c41b9dd1ad2c457e017a6d0e1dac0c23b604
2019-05-17 07:25:57 -07:00
Lorenzo Colitti
7f7ad61c24 [automerger skipped] Merge "Change the icon for the LOGGED_IN notification." into qt-dev
am: 38254b8bd7 -s ours
am skip reason: change_id I8250236bc4ba251492a6cb9bf23e67666ef860d3 with SHA1 b45f7ad98b is in history

Change-Id: I0ff820347cd8aa5e66150717d3406d6af5f749f7
2019-05-17 07:14:29 -07:00
Lorenzo Colitti
38254b8bd7 Merge "Change the icon for the LOGGED_IN notification." into qt-dev 2019-05-17 13:58:09 +00:00
Paul Hu
9c4b812c01 [automerger skipped] Merge "Ignore NetworkTest when running CtsNetTestCases in instant app mode" into qt-dev am: b725fc0059 -s ours
am: 361b17feba -s ours
am skip reason: change_id Ia28eea113e19b9c44998677e5b8093be178a06a3 with SHA1 bea628fb59 is in history

Change-Id: I98d262a12283319c32f14e03ac6b7c8ae7ee9096
2019-05-17 01:56:53 -07:00
Lorenzo Colitti
d663a3ba0a Merge "Change the icon for the LOGGED_IN notification." am: 2c3f94e392 am: fce3635550
am: c67e20d59c

Change-Id: I529ac4a707cdd9696186991a4f34cf5eaf26c8d8
2019-05-17 01:38:24 -07:00
Paul Hu
061a8ddb77 [automerger skipped] Merge "Ignore NetworkTest when running CtsNetTestCases in instant app mode" into qt-dev am: b725fc0059
am: b200928ed4 -s ours
am skip reason: change_id Ia28eea113e19b9c44998677e5b8093be178a06a3 with SHA1 bea628fb59 is in history

Change-Id: I4546fd5f500f7438f2efaaad95a67a5f01bc068d
2019-05-17 01:11:43 -07:00
Ian Kasprzak
db10850966 Reland: Add FrameworksNetTests dependency on libcgrouprc
Original CL description:
Add FrameworksNetTests dependency on libcgrouprc

The tests are currently broken without this dependency.

Bug: 132925169
Test: atest FrameworksNetTests
Change-Id: I473b250587d871158e1e9595d56183a0342238d8
Merged-In: If9c8aa41c4e96a79b71c88f199a4f3b0483e31cd
2019-05-17 17:11:16 +09:00
Paul Hu
361b17feba [automerger skipped] Merge "Ignore NetworkTest when running CtsNetTestCases in instant app mode" into qt-dev
am: b725fc0059 -s ours
am skip reason: change_id Ia28eea113e19b9c44998677e5b8093be178a06a3 with SHA1 bea628fb59 is in history

Change-Id: I1374882f23cc9676fff5562a35f1057f49f74040
2019-05-17 01:10:25 -07:00
Lorenzo Colitti
c67e20d59c Merge "Change the icon for the LOGGED_IN notification." am: 2c3f94e392
am: fce3635550

Change-Id: I9013d2d147979ffc03bc0da6b9a503f8ce623b70
2019-05-17 00:41:51 -07:00
Paul Hu
b725fc0059 Merge "Ignore NetworkTest when running CtsNetTestCases in instant app mode" into qt-dev 2019-05-17 06:46:36 +00:00
Lorenzo Colitti
ee5282105c Change the icon for the LOGGED_IN notification.
This notification is shown when the user has already logged in to
the network, so it should not have a question mark on it.

Fix: 130526201
Test: atest FrameworksNetTests
Test: manually signed in to portal
Change-Id: I8250236bc4ba251492a6cb9bf23e67666ef860d3
Merged-In: I8250236bc4ba251492a6cb9bf23e67666ef860d3
(cherry picked from commit fce363555029b92b1532058555797d6ef1afb09c)
2019-05-17 06:25:09 +00:00
Xin Li
f23b29e0dd [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: 8f33552b32 -s ours am: 704e63b17e -s ours
am: b7496ba841

Change-Id: Ia5d8d317555d6e50313c2abf664a6e607837f18e
2019-05-16 22:51:34 -07:00
Xin Li
b7496ba841 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: 8f33552b32 -s ours
am: 704e63b17e -s ours
am skip reason: subject contains skip directive

Change-Id: Ic4e3df2aa9f8996b10dfc0a596269bd508ae2549
2019-05-16 21:22:38 -07:00
Lorenzo Colitti
2c3f94e392 Merge "Change the icon for the LOGGED_IN notification." 2019-05-17 04:15:51 +00:00
Lorenzo Colitti
b45f7ad98b Change the icon for the LOGGED_IN notification.
This notification is shown when the user has already logged in to
the network, so it should not have a question mark on it.

Bug: 130526201
Test: atest FrameworksNetTests
Test: manually signed in to portal
Change-Id: I8250236bc4ba251492a6cb9bf23e67666ef860d3
2019-05-17 09:00:53 +09:00
Xin Li
7c25b83c12 [automerger skipped] Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master" into stage-aosp-master am: a4794fa4c4 -s ours am: 18a6c6eee0
am: 200fb81522 -s ours
am skip reason: subject contains skip directive

Change-Id: I15afdf5031788a7ee6ed6461a2ee62845a653a98
2019-05-16 11:31:33 -07:00
Xin Li
4a36159a1b [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: 4306eb11f0 -s ours am: 15308d614c
am: 05240f0b9f -s ours
am skip reason: subject contains skip directive

Change-Id: If74795d76ee42ab2ec4383dc45ff311c6aef1d84
2019-05-16 10:18:56 -07:00
Xiao Ma
4802c081e9 [automerger skipped] Merge "Clean up the arguments annotation and verify items on IpMemoryStoreTest." into qt-dev am: cfaa8ead59 -s ours am: 12232917c0 -s ours
am: 229c940bfc -s ours
am skip reason: change_id I8ce3bed435fbbb814d71fe48ffd305ff3f947f3f with SHA1 8f4a5a1bf8 is in history

Change-Id: I350a203a306fc3cc8a741760e0a0dfb0c441c4f4
2019-05-16 04:01:39 -07:00