Varun Anand
12f4d3d7e3
Merge "Add unit tests related to data accounting for VPNs with one underlying network." am: 43c87768e0
...
am: 5df3d62d01
Change-Id: I7ab73884266bc4b64d1914557a29e84fc4de431e
2019-03-19 09:37:37 -07:00
Varun Anand
5df3d62d01
Merge "Add unit tests related to data accounting for VPNs with one underlying network."
...
am: 43c87768e0
Change-Id: I91971112870c7a3a2d4786c25125204de7e008f5
2019-03-19 09:28:22 -07:00
Treehugger Robot
43c87768e0
Merge "Add unit tests related to data accounting for VPNs with one underlying network."
2019-03-19 16:18:28 +00:00
Xiao Ma
78e3f9ab7d
Merge "Move the IpMemoryStore to the network stack." am: edb899fcf8
...
am: 61e928c7cd
Change-Id: I20e384320309579b19fe44f3841ffbc49c028c6d
2019-03-19 06:44:45 -07:00
Xiao Ma
61e928c7cd
Merge "Move the IpMemoryStore to the network stack."
...
am: edb899fcf8
Change-Id: I672d07ca2d0a251c246993ab8c7c3075de385570
2019-03-19 06:35:31 -07:00
Xiao Ma
edb899fcf8
Merge "Move the IpMemoryStore to the network stack."
2019-03-19 13:21:12 +00:00
Remi NGUYEN VAN
18017cb6d1
Add documentation for CaptivePortal APP_RETURN_*
...
This fixes API review requests.
Test: atest FrameworksNetTests NetworkStackTests
Bug: 126883311
Change-Id: I0632a98675e65c5e722e81a2c1e0cf1403b54395
2019-03-19 18:57:44 +09:00
Luke Huang
cadce1355b
Merge "Replace Handler with Executor for async DNS API" am: 21be4d297c
...
am: 699127bae2
Change-Id: I40ce45d039e01f831b6f4f50ed360a2a206a1146
2019-03-18 23:25:58 -07:00
Luke Huang
d54dc33070
Merge "Refactor answer callback for async DNS query JAVA API" am: 2b474c454f
...
am: 5f80d53df8
Change-Id: I7538b247c5bd84d7f5b21be11b9bb1940fb9ba5a
2019-03-18 23:09:58 -07:00
Luke Huang
699127bae2
Merge "Replace Handler with Executor for async DNS API"
...
am: 21be4d297c
Change-Id: I5fb0d659d27894ca9f243654f9283764f1369745
2019-03-18 23:05:15 -07:00
Luke Huang
5f80d53df8
Merge "Refactor answer callback for async DNS query JAVA API"
...
am: 2b474c454f
Change-Id: I26eb642cc04e3804cd82a56e45a890689b3c643f
2019-03-18 22:55:37 -07:00
Luke Huang
21be4d297c
Merge "Replace Handler with Executor for async DNS API"
2019-03-19 05:35:39 +00:00
Luke Huang
2b474c454f
Merge "Refactor answer callback for async DNS query JAVA API"
2019-03-19 05:35:18 +00:00
Mark Chien
3baef16087
Merge "Remove deprecated entitlement API" am: 2adc944732
...
am: 74b3b60b76
Change-Id: I6028d1f11f99bf5719f0d2a5b387fe651905aba3
2019-03-18 20:22:09 -07:00
Mark Chien
74b3b60b76
Merge "Remove deprecated entitlement API"
...
am: 2adc944732
Change-Id: I6b19b684a1dfa509ee77304d6acfe3fcdb6ca69c
2019-03-18 20:00:35 -07:00
Mark Chien
2adc944732
Merge "Remove deprecated entitlement API"
2019-03-19 02:44:37 +00:00
Chenbo Feng
ceb0eba5bd
Add uid information in PackageListObserver
...
The uid information of a removed package cannot be retrieved by the
packageName anymore once it is removed. So it would be useful to provide
the uid of removed package in the onPackageAdded and onPackageRemoved
method of the PackageListObserver. This modification helps simplify the
design in PermissionMonitor.
Bug: 125396053
Test: dumpsys netd trafficcontroller
Exempt-From-Owner-Approval: Already merged in internal master
Merged-In: I2bd4bdf924687960a4fa3a47235bae68d885e445
Change-Id: I2bd4bdf924687960a4fa3a47235bae68d885e445
2019-03-18 19:32:29 -07:00
TreeHugger Robot
376b30f985
Merge "Revert "Revert "Update VPN capabilities when its underlying network set is null.""" into pi-dev
2019-03-19 02:00:38 +00:00
TreeHugger Robot
182784fea4
Merge "Remove ConnectivityManager and its usages from NetworkStatsService." into pi-dev
2019-03-19 02:00:38 +00:00
Chalard Jean
4ae71e9ebc
Move the IpMemoryStore to the network stack.
...
Test: atest FrameworksNetTests
Change-Id: Ic5bd6ff54b09a6fa92b6863f240a5b053011acb6
2019-03-18 11:33:17 +09:00
Remi NGUYEN VAN
3f8edc8006
Merge "Remove NetworkParcelable" am: 7b9d4803b6
...
am: d7f138704b
Change-Id: Ice0f04749d2b7c2863ad18c29f5967649127ee0e
2019-03-17 18:55:26 -07:00
Remi NGUYEN VAN
d7f138704b
Merge "Remove NetworkParcelable"
...
am: 7b9d4803b6
Change-Id: I8dc6d665a33d19ecad2bd5f611c2b68e08d53b97
2019-03-17 18:44:58 -07:00
Remi NGUYEN VAN
7b9d4803b6
Merge "Remove NetworkParcelable"
2019-03-18 01:30:25 +00:00
Luke Huang
b1cf5aaf06
Support query cancellation for async DNS API
...
Bug: 124882626
Test: built, flashed, booted
atest DnsResolverTest DnsPacketTest
Change-Id: Iaa72f5c17f58cf0a58663b892bb18cfdf23cd545
2019-03-16 18:53:09 +08:00
Luke Huang
dfd2e4da29
Replace Handler with Executor for async DNS API
...
Bug: 124882626
Test: built, flashed, booted
atest DnsResolverTest DnsPacketTest
Change-Id: Ie1dc27643d4767f2a8a39da755edf388a00962d5
2019-03-16 18:53:07 +08:00
Luke Huang
6d72b2c073
Refactor answer callback for async DNS query JAVA API
...
1. refactor AnswerCallback with a generic type
2. support onError in AnswerCallback
3. Fix minor problem reported from API Review
Bug: 124882626
Test: built, flashed, booted
atest DnsResolverTest DnsPacketTest
Change-Id: I685c9989f8401acb63d2e83f552b2d5b20c41af0
2019-03-16 18:53:05 +08:00
Varun Anand
3a84b3cee7
Add unit tests related to data accounting for VPNs with one underlying
...
network.
This is to establish a baseline for the existing behavior, and to ensure
that following changes are not causing a regression in existing
behavior.
This CL is also adding missing cleanup for NetworkStatsCollectionTest
which was forcing all network types in NetworkTemplate that was causing
NetworkStatsService related tests to fail.
Bug: 113122541
Bug: 120145746
Test: atest FrameworksNetTests
Change-Id: I285f186cfb16bc9fa704c797996b1e4f8a73dee4
2019-03-15 17:23:28 -07:00
Jack Yu
7a1a9822f4
Merge "Moved transport to IntDef" am: 122c557701
...
am: e8bb52935c
Change-Id: I9a68e86efd37018db87dfb09af58fba8b99c3b15
2019-03-15 16:40:23 -07:00
Jack Yu
e8bb52935c
Merge "Moved transport to IntDef"
...
am: 122c557701
Change-Id: I80d2bf5b3d195d4b05135006418ba4b638271f4f
2019-03-15 16:31:06 -07:00
Treehugger Robot
122c557701
Merge "Moved transport to IntDef"
2019-03-15 23:21:29 +00:00
Remi NGUYEN VAN
eb42f2f9e7
Remove NetworkParcelable
...
With the @JavaOnlyStableParcelable annotation, Network can now be used
as-is as a framework parcelable.
Test: atest FrameworksNetTests NetworkStackTests
Bug: 126477266
Change-Id: I5d9695a31b3ac48d10edcf08ccd0c34375353b79
2019-03-16 03:51:09 +09:00
Benedict Wong
d13dcbe59c
Merge "Integrate testNetworkService and Manager with Connectivity stack" am: 546bcbb218
...
am: 7d82f9cf63
Change-Id: If9efbc3e0b3f0949286a2a5ad8226009ebbcfc07
2019-03-15 10:59:21 -07:00
Benedict Wong
7d82f9cf63
Merge "Integrate testNetworkService and Manager with Connectivity stack"
...
am: 546bcbb218
Change-Id: I571e583d896841c814efe58b8c0875fa9cd3873c
2019-03-15 10:50:06 -07:00
Benedict Wong
546bcbb218
Merge "Integrate testNetworkService and Manager with Connectivity stack"
2019-03-15 17:41:02 +00:00
markchien
92344ef44f
Remove deprecated entitlement API
...
The deprecated entitlement APIs[1] is introduced in the Q
development cycle. It should be replaced by new APIs[2][3].
[1] https://android-review.googlesource.com/c/platform/frameworks/base/+/874220
[2] https://android-review.googlesource.com/c/platform/frameworks/base/+/920354
[3] https://android-review.googlesource.com/c/platform/frameworks/base/+/927513
Test: -build, flash, boot
bug: 126701557
bug: 126392011
Change-Id: I96487e9038c07363680a76db840994719d7ff768
2019-03-15 09:03:50 +00:00
Junyu Lai
06ea4015bf
Merge "[KA02.5] Use binder thread and executor to invoke callback" am: f9ae70a41c
...
am: c93f9c7f0e
Change-Id: I259ff770ce491d9dec5d136202bebf08e6de58e2
2019-03-15 01:10:46 -07:00
Junyu Lai
c93f9c7f0e
Merge "[KA02.5] Use binder thread and executor to invoke callback"
...
am: f9ae70a41c
Change-Id: I892d4f4dc786aa42dcbe565f345e9a731f318c8a
2019-03-15 00:53:55 -07:00
Remi NGUYEN VAN
df04297b86
Add Parcelable implementation for ApfCapabilities
...
This is necessary to allow usage of ApfCapabilities as-is in AIDL,
instead of relying on ApfCapabilitiesParcelable, assuming that stable
AIDL starts allowing usage of @SystemApi classes. The Parcelable
implementation would be convenient for clients in any case.
Bug: 126477266
Test: atest FrameworksNetTests
Change-Id: Id2ef3cad261832a2918ccb6bb6bc154d99d75746
2019-03-15 13:41:59 +09:00
Jack Yu
7e0f9143e6
Moved transport to IntDef
...
Moved out from the sub class per API review feedback.
Test: Build
Bug: 128607082
Merged-In: I1b513bcaaa0ebf47c14593d962579ed48a7c6db0
Change-Id: I1b513bcaaa0ebf47c14593d962579ed48a7c6db0
2019-03-14 20:32:16 -07:00
Varun Anand
bf1d84cc4e
Revert "Revert "Update VPN capabilities when its underlying network set is null.""
...
This reverts commit c0e7f75e70 .
Reason for revert: Retargeted for June monthly release
Bug: 119129310
Change-Id: I9d543415c5707859cfa2a14a1a8ce5909aae7d11
Merged-In: Id0abc4d304bb096e92479a118168690ccce634ed
2019-03-14 18:31:55 +00:00
junyulai
070f9ff460
[KA02.5] Use binder thread and executor to invoke callback
...
Currently, client side of keepalive event handling rely on a
newly created thread, looper, messenger and handler per object.
However, by creating oneway AIDL interface with the executor,
the callbacks can be invoked on the binder thread with user
specified context, which not only greatly simplify the design
but also reduce the cost of current thread modeling.
Bug: 114151147
Bug: 123969871
Test: 1. atest FrameworksNetTests --generate-new-metric 10
2. atest-deflake.sh
Change-Id: I27504074cd28d5b5eb94a7ec0e97ebaaaaa1ae3d
2019-03-14 19:24:12 +08:00
Jeremy Klein
9ac0bea512
Merge "Rename entitlement callback to adhere to API guidelines." am: 9e77cca082
...
am: de59c0cc99
Change-Id: I29bbf7cbbc0d87a9831762342d81496e6983df68
2019-03-12 23:36:36 -07:00
Jeremy Klein
de59c0cc99
Merge "Rename entitlement callback to adhere to API guidelines."
...
am: 9e77cca082
Change-Id: If58d5724000fba5e1d794a98ccc89b73ce842f4a
2019-03-12 22:39:53 -07:00
Chalard Jean
422dc75001
Merge "Tell the factory it is already serving a request." am: 11230da789
...
am: 55556c9c3a
Change-Id: I8c89110d3b8d55fb8c516a966f4726d4059a098e
2019-03-12 22:21:24 -07:00
Ian Kasprzak
b08ebd5e39
Merge "Temporarily disable flaky test." am: 89351e03ed
...
am: ead65bd578
Change-Id: Ice8e6cd6cad901ca937ca0953049c2f9c83548f8
2019-03-12 22:15:44 -07:00
Xiao Ma
82383d0f6e
Merge "[KA13]: add unit test for exposed TCP socket keepalive API." am: 87b73b01df
...
am: f4b7872afa
Change-Id: I2a2061df07612a9415528e18c6f741e750127adb
2019-03-12 22:01:06 -07:00
Treehugger Robot
9e77cca082
Merge "Rename entitlement callback to adhere to API guidelines."
2019-03-13 04:48:24 +00:00
Chalard Jean
55556c9c3a
Merge "Tell the factory it is already serving a request."
...
am: 11230da789
Change-Id: I4c3948c2e7098668cf881d3f31fda87be1250828
2019-03-12 21:42:18 -07:00
Ian Kasprzak
ead65bd578
Merge "Temporarily disable flaky test."
...
am: 89351e03ed
Change-Id: Ie482f459c2f8bce40098657daa39efccfdf2bcd3
2019-03-12 21:38:43 -07:00
Xiao Ma
f4b7872afa
Merge "[KA13]: add unit test for exposed TCP socket keepalive API."
...
am: 87b73b01df
Change-Id: I79fb97913e8b69c525733dcaec59a60ac6b980b6
2019-03-12 21:29:48 -07:00