am: 38254b8bd7 -s ours
am skip reason: change_id I8250236bc4ba251492a6cb9bf23e67666ef860d3 with SHA1 b45f7ad98b is in history
Change-Id: I0ff820347cd8aa5e66150717d3406d6af5f749f7
am: 361b17feba -s ours
am skip reason: change_id Ia28eea113e19b9c44998677e5b8093be178a06a3 with SHA1 bea628fb59 is in history
Change-Id: I98d262a12283319c32f14e03ac6b7c8ae7ee9096
am: b200928ed4 -s ours
am skip reason: change_id Ia28eea113e19b9c44998677e5b8093be178a06a3 with SHA1 bea628fb59 is in history
Change-Id: I4546fd5f500f7438f2efaaad95a67a5f01bc068d
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
am: b725fc0059 -s ours
am skip reason: change_id Ia28eea113e19b9c44998677e5b8093be178a06a3 with SHA1 bea628fb59 is in history
Change-Id: I1374882f23cc9676fff5562a35f1057f49f74040
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)
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
am: 12232917c0 -s ours
am skip reason: change_id I1db13a48b59d743482436ecf8a20d7f12edd6e1c with SHA1 992b7f79a7 is in history
Change-Id: Ie048073d8e5b7da0a6f547a4ebcec0a8809f8b53
am: cfaa8ead59 -s ours
am skip reason: change_id I1db13a48b59d743482436ecf8a20d7f12edd6e1c with SHA1 992b7f79a7 is in history
Change-Id: Ie908aaa904db4fd8540819b3afe2930de273e28a
am: cfaa8ead59 -s ours
am skip reason: change_id I1db13a48b59d743482436ecf8a20d7f12edd6e1c with SHA1 992b7f79a7 is in history
Change-Id: I206c3efa264a7a8b16f07683c7c1bbf9fb29b426
am: 4f47f2c827 -s ours
am skip reason: change_id I25224c9576f52d2a0a0bd2182325c7aac7b28eb5 with SHA1 2bebfc2b87 is in history
Change-Id: Ia49181982198f2074a11afc881a047f86263699b
am: 2bebfc2b87 -s ours
am skip reason: change_id I25224c9576f52d2a0a0bd2182325c7aac7b28eb5 with SHA1 4737299d94 is in history
Change-Id: If4d60807fd1cc312393bf56830f09bddeff7b59f
am: 53e2a9b0ae -s ours
am skip reason: change_id I1025da29beb53259f57bd9ca5648b32f2847ed4a with SHA1 a4980fc1fd is in history
Change-Id: I0fd395b418475c6b9d8ac7dbd363d43e437d2203
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)
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: I61be1b0647f4165665a2d4166311adeac956e0d4
Delete the unused NetworkManagementService API for set/remove
permissions. Use PERMISSION_NONE to replace NO_PERMISSIONS so the
framework now use the same set of permission constant when communicate
with netd.
Bug: 128944261
Test: PermissionMonitorTest.java
Change-Id: I25224c9576f52d2a0a0bd2182325c7aac7b28eb5
Merged-In: I25224c9576f52d2a0a0bd2182325c7aac7b28eb5
(cherry picked from commit 05887f99c6ca6885db737af2f356023dc6de80a2)
am: 31e7bbccb1 -s ours
am skip reason: change_id Ic97ffe9ff5781778efd264460809f5059f0f4230 with SHA1 77abd94876 is in history
Change-Id: I40a476b7bb8b4cff1107e5786f5da2900ef0462f
am: c31ccecf6c -s ours
am skip reason: change_id I0481a469ee23231e5f0ab738a06b5e09f6cdb680 with SHA1 6e2c653c6e is in history
Change-Id: Ib6b1225fa45270974cce121a60e46f49f79e68ec
Remove definition of TYPE_NATT and TYPE_TCP since the type
can be identified by checking message.obj is an instance of
NattKeepalivePacketData or TcpKeepalivePacketData.
It's more simple and won't have dependency on KeepaliveInfo.
Bug: 33530442
Test: atest FrameworksNetTests
atest NetworkStackTests
(Clean cherry-pick of aosp/955419)
Change-Id: Ic97ffe9ff5781778efd264460809f5059f0f4230
Merged-In: Ic97ffe9ff5781778efd264460809f5059f0f4230
In aosp/951200, the clean up function delete the item in the
hash map that holds the record while iterating it, where the
list used to iterate the records is backed by the hash map,
so changes to the map are reflected in the list and caused
the concurrent modification exception.
Bug: 132341736
Test: 1. atest com.android.server.ConnectivityServiceTest \
#testNattSocketKeepalives --generate-new-metrics 300
2. atest FrameworksNetTests --generate-new-metrics 10
(Clean cherry-pick of aosp/959599)
Change-Id: I9cdfe6f6d11c5400c856cc30a33ff4a44ba9d811
Merged-In: I0481a469ee23231e5f0ab738a06b5e09f6cdb680
In general, keepalive slots are released after result of
stopping has returned. However, for network disconnect case,
the service side cannot communicate with network agent since
the async channel is broken.
Clean up keepalive slots right after stop in this case.
Bug: 132341736
Test: 1. atest com.android.server.ConnectivityServiceTest \
#testNattSocketKeepalives --generate-new-metrics 100
2. atest FrameworksNetTests --generate-new-metrics 10
Change-Id: Id3e4e159713c0ed7e03f45169e87b73ae6408e4f
(cherry picked from commit a5f6bd16062fba89bcf900aca93aa3514d93f662)
Merged-In: Id3e4e159713c0ed7e03f45169e87b73ae6408e4f
Merged-In: Icb5a1b5bb10617aa5a7b35db6cf48db3dc53b7fd
Currntly, keepalive slot is released when stop() is called. Next
starting keepalive can use the same slot number while previous
keepalive is still stopping. When the previous keepalive is
stopped, the incoming as will be processed by the new keepalive.
This change release keepalive slot after the result of stopping
has returned. Thus, newly created keepalive cannot allocate the
same slot number while lower layer is still processing stop event.
This change also disable flaky assertions that are caused by
test port has been occupied by other process.
Bug: 129512753
Test: 1. atest com.android.server.ConnectivityServiceTest \
#testNattSocketKeepalives --generate-new-metrics 100
2. atest FrameworksNetTests --generate-new-metrics 10
3. simulate the fail case manually.
Change-Id: I790f6bbc5efc3f088034ac45ec379da5f781d0ca
Merged-In: I1991627545519ee5cb408a3df3a006f710f4af7b
(cherry picked from commit 3523a3d02a1f88a3990ab9cc4948c705ecc713c8)
