am: c9d83b455f -s ours
am skip reason: change_id I4882686a86e7c6d42f4b0619b921d02619ed6d4c with SHA1 72172969cc is in history
Change-Id: I3e682721ed3e8a574d84d12baf84cc2d6c097412
am: 875fb730f8 -s ours
am skip reason: change_id Ic9e078f8acf7688850dfe31f15ed065739ad5281 with SHA1 973f5707bc is in history
Change-Id: Id5542048791df174c17b5c74651dddc5ee304b7f
am: 4a92ec452f -s ours
am skip reason: change_id I9b648ed6c687d56db61a54570c7880c51c1bae51 with SHA1 fec32def7c is in history
Change-Id: If30091ab2a164d01cab11fdd7e6e3aeaa805082c
As per API council feedback, these constants should live in
a place that is private to the network stack, only with a
range defined in system API.
Bug: 129433383
Test: m
Change-Id: I84a90f84a9af6fef4667ee4d512ebd0413222086
Merged-In: I4882686a86e7c6d42f4b0619b921d02619ed6d4c
Merged-In: I9b648ed6c687d56db61a54570c7880c51c1bae51
As per API council feedback, these constants should live in
a place that is private to the network stack, only with a
range defined in system API.
Bug: 129433383
Test: m
Change-Id: I84a90f84a9af6fef4667ee4d512ebd0413222086
(cherry picked from commit 79a6330650ca04bd7a08afbd63f8016a3b30bc72)
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: I1991627545519ee5cb408a3df3a006f710f4af7b
am: 6f01452d74 -s ours
am skip reason: change_id I5737cf293264bf9d492e7bd56b62bee4d49002eb with SHA1 dca57c2e44 is in history
Change-Id: I0781beb81ab6bf9499544548b0e50796797dee87
am: 965ddfdc5d -s ours
am skip reason: change_id I5737cf293264bf9d492e7bd56b62bee4d49002eb with SHA1 dca57c2e44 is in history
Change-Id: I44c2d7e34d6351cc2b862aa99d0ef0260130961b
A mocked PackageManager caused test failures in existing tests.
Revert that for now to make tests pass again.
Bug: 114231106
Bug: 130397860
Test: atest FrameworksNetTests
Change-Id: I4f181789152438f18e6cd2d235d76fabe3872ea3
This reverts commit 2b6cd177ba.
Reason for revert: Rolling forward, will fix tests in same CL stack.
Bug: 114231106
Bug: 130397860
Test: FrameworksNetTests
Change-Id: Ia8a0c99b4e1fd5dff26c881715cd876618ca4321
This reverts commit 1c19cf383f.
This change does not have any topic: not reverting the other 2 commits in the original topic.
Reason for revert: broke FrameworksNetTests presubmit: b/130397860
Change-Id: Iff41d9fe97fafea44680c8d67d1ce19277548cc0
To address the API review feedback provided by
the API council.
Bug: 129261432
Test: atest DnsResolverTest
Merged-In: I5737cf293264bf9d492e7bd56b62bee4d49002eb
(cherry picked from commit dca57c2e44)
Change-Id: I429dd93285f50314e9d757f4ec8539a3ba40e61b
am: 913829e75a -s ours
am skip reason: change_id I98573a5c68e45abbbaddef01f6ac74a6a18e26f9 with SHA1 0fed3d2c01 is in history
Change-Id: Ib5c3e6b7f7a3b766d6119451af3f77b7ea2f5052
am: 2c005f2cd2 -s ours
am skip reason: change_id I88bfd7f37c0ba0228f8288fe92212618ce134e4f with SHA1 4f370cefa2 is in history
Change-Id: Ia633c9de407a62075e05efa807a017013fc028ce
am: 3b5424047c -s ours
am skip reason: change_id I98573a5c68e45abbbaddef01f6ac74a6a18e26f9 with SHA1 0fed3d2c01 is in history
Change-Id: I80f0924a1a1f83962c6dee7fd937a341075327e4
