Commit Graph

6851 Commits

Author SHA1 Message Date
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
93f36d6d7e Merge "Let clients access StaticIpConfiguration members through reflection." am: 65663acf34
am: 892038673e

Change-Id: Ice5c4fd4d469a55410129310c5a25874b94e2219
2019-05-22 02:42:25 -07: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
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
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
200fb81522 [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

Change-Id: I985f8b208fd21e51d9d1242abff20633973e16f5
2019-05-16 03:39:53 -07:00
Xin Li
05240f0b9f [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: 4306eb11f0 -s ours
am: 15308d614c

Change-Id: I1ea42cf9707eab5195cc08c42277567db59df5e9
2019-05-16 02:38:23 -07:00
Xiao Ma
229c940bfc [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 skip reason: change_id I1db13a48b59d743482436ecf8a20d7f12edd6e1c with SHA1 992b7f79a7 is in history

Change-Id: Ie048073d8e5b7da0a6f547a4ebcec0a8809f8b53
2019-05-15 22:13:56 -07:00
Xin Li
18a6c6eee0 [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 skip reason: subject contains skip directive

Change-Id: Iad8736143771d3baae850bbfc2aef5d78d9ca96a
2019-05-15 18:47:59 -07:00
Xiao Ma
36d894ca5c [automerger skipped] Merge "Clean up the arguments annotation and verify items on IpMemoryStoreTest." into qt-dev
am: cfaa8ead59 -s ours
am skip reason: change_id I1db13a48b59d743482436ecf8a20d7f12edd6e1c with SHA1 992b7f79a7 is in history

Change-Id: Ie908aaa904db4fd8540819b3afe2930de273e28a
2019-05-15 17:50:03 -07:00
Xin Li
15308d614c [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master
am: 4306eb11f0 -s ours
am skip reason: subject contains skip directive

Change-Id: I428e3fbada5f4715f4934d7e2210e0eef51a0d40
2019-05-15 17:32:18 -07:00
Xin Li
8f33552b32 DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master.
Bug: 132622481
Change-Id: I8a3d38c16d3de15514e2418d13d61b57b2cfd907
2019-05-15 16:55:34 -07:00
TreeHugger Robot
a4794fa4c4 Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master" into stage-aosp-master 2019-05-15 23:02:14 +00:00
Xin Li
4306eb11f0 DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master
Bug: 132622481
Change-Id: I7ba1a9999b3a9bac8031dd086fa2632e45404f32
2019-05-15 11:31:45 -07:00
Xiao Ma
12232917c0 [automerger skipped] Merge "Clean up the arguments annotation and verify items on IpMemoryStoreTest." into qt-dev
am: cfaa8ead59 -s ours
am skip reason: change_id I1db13a48b59d743482436ecf8a20d7f12edd6e1c with SHA1 992b7f79a7 is in history

Change-Id: I206c3efa264a7a8b16f07683c7c1bbf9fb29b426
2019-05-15 09:22:19 -07:00
Xiao Ma
30dfd6ecfa Clean up the arguments annotation and verify items on IpMemoryStoreTest.
Bug: 131133347
Test: atest FrameworksNetTests

Merged-In: I8ce3bed435fbbb814d71fe48ffd305ff3f947f3f
Merged-In: I1db13a48b59d743482436ecf8a20d7f12edd6e1c
(cherry picked from commit 7567c4ac50508c2bcd38b37fc48b299912a34cf5)

Change-Id: I78024c0e25d812639d1236faa59d383742ae2141
2019-05-15 14:53:42 +00:00
Paul Hu
5688ce39c4 Ignore NetworkTest when running CtsNetTestCases in instant app mode
Ignore NetworkTest#testBindSocketOfConnectedDatagramSocketThrows
when running CtsNetTestCases in instant app mode due to sockect
cannot bind in instant app mode.

Bug: 123366918
Test: atest CtsNetTestCases --instant
Test: atest FrameworksNetTests

Change-Id: I1e93d4491e3d9e5a095ff4b6169b2f70e7b3b690
Merged-In: Ia28eea113e19b9c44998677e5b8093be178a06a3
Merged-In: I1e93d4491e3d9e5a095ff4b6169b2f70e7b3b690
(cherry picked from commit 73c0d48b14488c93b2f42a1e149e4be8499d3469)
2019-05-15 06:58:27 +00:00
Lorenzo Colitti
538c643533 [automerger skipped] Merge "Clean up the permission control code in framework" into qt-dev
am: 4f47f2c827 -s ours
am skip reason: change_id I25224c9576f52d2a0a0bd2182325c7aac7b28eb5 with SHA1 2bebfc2b87 is in history

Change-Id: Ia49181982198f2074a11afc881a047f86263699b
2019-05-14 23:49:27 -07:00
Chenbo Feng
7a8e7fc512 [automerger skipped] Clean up the permission control code in framework
am: 2bebfc2b87 -s ours
am skip reason: change_id I25224c9576f52d2a0a0bd2182325c7aac7b28eb5 with SHA1 4737299d94 is in history

Change-Id: If4d60807fd1cc312393bf56830f09bddeff7b59f
2019-05-14 23:43:03 -07:00
Lorenzo Colitti
4f47f2c827 Merge "Clean up the permission control code in framework" into qt-dev 2019-05-15 06:26:52 +00:00
Paul Hu
399f297121 [automerger skipped] Merge "Fix captive portal app can be launched w/o MAINLINE_NETWORK_STACK permission" into qt-dev
am: 53e2a9b0ae -s ours
am skip reason: change_id I1025da29beb53259f57bd9ca5648b32f2847ed4a with SHA1 a4980fc1fd is in history

Change-Id: I0fd395b418475c6b9d8ac7dbd363d43e437d2203
2019-05-14 21:51:21 -07:00
Paul Hu
bea628fb59 Merge "Ignore NetworkTest when running CtsNetTestCases in instant app mode" am: a00c638ebe
am: a582a82795

Change-Id: Ia28eea113e19b9c44998677e5b8093be178a06a3
2019-05-14 21:35:43 -07:00
Paul Hu
a582a82795 Merge "Ignore NetworkTest when running CtsNetTestCases in instant app mode"
am: a00c638ebe

Change-Id: I670b9847a2e3b3b794ee4694a0838440cabdc39f
2019-05-14 21:17:33 -07:00
Paul Hu
a00c638ebe Merge "Ignore NetworkTest when running CtsNetTestCases in instant app mode" 2019-05-15 03:42:32 +00:00
Paul Hu
49ea93861d Fix captive portal app can be launched w/o MAINLINE_NETWORK_STACK permission
Caller should get SecurityException if called
ConnectivityManager#startCaptivePortalApp() w/o
MAINLINE_NETWORK_STACK permission. But now it will not get any
exception and can launch captive portal app successfully.

Bug: 132662433
Test: atest android.net.cts.ConnectivityManagerTest#testStartCaptivePortalApp
      w and w/o MAINLINE_NETWORK_STACK permission
Test: atest FrameworksNetTests NetworkStackTests

Change-Id: Ib70fe6fad107f3e9dce9ce673188c5ce5dc1ad7b
Merged-In: I1025da29beb53259f57bd9ca5648b32f2847ed4a
Merged-In: Ib70fe6fad107f3e9dce9ce673188c5ce5dc1ad7b
(cherry picked from commit 72b3ab18ca302a3117f424a0f0ef6c08897c310e)
2019-05-15 02:09:52 +00:00