Commit Graph

6198 Commits

Author SHA1 Message Date
Mark Chien
c520bdaa2f Merge "Remove deprecated entitlement API" am: 9d9850ae30 am: c818ace0cc
am: 057dc5b976

Change-Id: I6bb5611de8d45e9a5c17128ea38ba1bdd8f86ac2
2019-03-18 20:38:36 -07:00
Mark Chien
057dc5b976 Merge "Remove deprecated entitlement API" am: 9d9850ae30
am: c818ace0cc

Change-Id: I6028d1f11f99bf5719f0d2a5b387fe651905aba3
2019-03-18 20:22:09 -07:00
Mark Chien
c818ace0cc Merge "Remove deprecated entitlement API"
am: 9d9850ae30

Change-Id: I6b19b684a1dfa509ee77304d6acfe3fcdb6ca69c
2019-03-18 20:00:35 -07:00
Mark Chien
9d9850ae30 Merge "Remove deprecated entitlement API" 2019-03-19 02:44:37 +00:00
Remi NGUYEN VAN
bd87531730 Merge "Remove NetworkParcelable" am: 7391d04a26 am: 7dc93f8a1e
am: f363d924dc

Change-Id: Ifec0dd683bf9c9b73c4af12835b76d284559daf8
2019-03-17 19:12:02 -07:00
Remi NGUYEN VAN
f363d924dc Merge "Remove NetworkParcelable" am: 7391d04a26
am: 7dc93f8a1e

Change-Id: Ice0f04749d2b7c2863ad18c29f5967649127ee0e
2019-03-17 18:55:26 -07:00
Remi NGUYEN VAN
7dc93f8a1e Merge "Remove NetworkParcelable"
am: 7391d04a26

Change-Id: I8dc6d665a33d19ecad2bd5f611c2b68e08d53b97
2019-03-17 18:44:58 -07:00
Remi NGUYEN VAN
7391d04a26 Merge "Remove NetworkParcelable" 2019-03-18 01:30:25 +00:00
Jack Yu
0db2c72480 [automerger skipped] Merge "Moved transport to IntDef" am: 7b163381e2 am: 803679947b
am: 254fad9ee3 -s ours
am skip reason: change_id I1b513bcaaa0ebf47c14593d962579ed48a7c6db0 with SHA1 863427190e is in history

Change-Id: Iae5ff42920f769ecfc9de290f513bd926e4de77b
2019-03-15 16:53:51 -07:00
Jack Yu
254fad9ee3 Merge "Moved transport to IntDef" am: 7b163381e2
am: 803679947b

Change-Id: I9a68e86efd37018db87dfb09af58fba8b99c3b15
2019-03-15 16:40:23 -07:00
Jack Yu
803679947b Merge "Moved transport to IntDef"
am: 7b163381e2

Change-Id: I80d2bf5b3d195d4b05135006418ba4b638271f4f
2019-03-15 16:31:06 -07:00
Treehugger Robot
7b163381e2 Merge "Moved transport to IntDef" 2019-03-15 23:21:29 +00:00
Jack Yu
99a242098f Merge "Moved transport to IntDef" 2019-03-15 21:16:42 +00:00
Remi NGUYEN VAN
633c331167 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
d23dc8057d [automerger skipped] Merge "Integrate testNetworkService and Manager with Connectivity stack" am: bc233c9e62 am: 9741d886d9
am: feaff7f7b6 -s ours
am skip reason: change_id I741ef9cdf4bd4125d9129af3a030edf32f438e4f with SHA1 8e972f5b2c is in history

Change-Id: Ic64ea5abdc07034b674c1365de7af75abd94d119
2019-03-15 11:13:04 -07:00
Benedict Wong
feaff7f7b6 Merge "Integrate testNetworkService and Manager with Connectivity stack" am: bc233c9e62
am: 9741d886d9

Change-Id: If9efbc3e0b3f0949286a2a5ad8226009ebbcfc07
2019-03-15 10:59:21 -07:00
Benedict Wong
9741d886d9 Merge "Integrate testNetworkService and Manager with Connectivity stack"
am: bc233c9e62

Change-Id: I571e583d896841c814efe58b8c0875fa9cd3873c
2019-03-15 10:50:06 -07:00
Benedict Wong
bc233c9e62 Merge "Integrate testNetworkService and Manager with Connectivity stack" 2019-03-15 17:41:02 +00:00
markchien
5fe817f59c 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
6c1a593fef Merge "[KA02.5] Use binder thread and executor to invoke callback" am: f9ae70a41c am: 750fbd0ab2
am: 686be8c9b0

Change-Id: I881c1ab09187ab23facc03bb71cc38a7978e442c
2019-03-15 01:19:55 -07:00
Junyu Lai
686be8c9b0 Merge "[KA02.5] Use binder thread and executor to invoke callback" am: f9ae70a41c
am: 750fbd0ab2

Change-Id: I259ff770ce491d9dec5d136202bebf08e6de58e2
2019-03-15 01:10:46 -07:00
Junyu Lai
750fbd0ab2 Merge "[KA02.5] Use binder thread and executor to invoke callback"
am: f9ae70a41c

Change-Id: I892d4f4dc786aa42dcbe565f345e9a731f318c8a
2019-03-15 00:53:55 -07:00
Jack Yu
9eda62ac04 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
Jack Yu
863427190e Moved transport to IntDef
Moved out from the sub class per API review feedback.

Test: Build
Bug: 128607082
Change-Id: I1b513bcaaa0ebf47c14593d962579ed48a7c6db0
2019-03-14 19:24:49 -07:00
junyulai
9f87223db2 [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
Benedict Wong
0077ec0d3f Merge "Integrate testNetworkService and Manager with Connectivity stack" 2019-03-13 16:48:07 +00:00
Jeremy Klein
c31936d4b4 Merge "Rename entitlement callback to adhere to API guidelines." am: a3c10cd22b am: b0f9bd21a2
am: 3abf3bc260

Change-Id: Iba73611c9330463f4517ac1555b6ee000d740c71
2019-03-12 23:57:05 -07:00
Jeremy Klein
3abf3bc260 Merge "Rename entitlement callback to adhere to API guidelines." am: a3c10cd22b
am: b0f9bd21a2

Change-Id: I29bbf7cbbc0d87a9831762342d81496e6983df68
2019-03-12 23:36:36 -07:00
Android Build Merger (Role)
87652710ba Merge "[automerger skipped] Merge "Tell the factory it is already serving a request." am: 40f6974c7a am: 183de75174 am: c9996fbf4a -s ours am skip reason: change_id I597ac588f76dd507512ff02868fd1310b7e63f7e with SHA1 7265562175 is in history" 2019-03-13 05:48:55 +00:00
Chalard Jean
0d47246b72 [automerger skipped] Merge "Tell the factory it is already serving a request." am: 40f6974c7a am: 183de75174
am: c9996fbf4a -s ours
am skip reason: change_id I597ac588f76dd507512ff02868fd1310b7e63f7e with SHA1 7265562175 is in history

Change-Id: I19e8d1b43338fa64eaccf9ae3039c878ff7cf3c5
2019-03-12 22:47:50 -07:00
TreeHugger Robot
df37c8d23e Merge "Add uid information in PackageListObserver" 2019-03-13 05:45:34 +00:00
Ian Kasprzak
e04686ec67 Merge "Temporarily disable flaky test." am: d146d717c7 am: 3bab305ed9
am: 40088b623f

Change-Id: Ifcfee2d83c2a173f1cc2f22597aff3cffe558281
2019-03-12 22:40:38 -07:00
Jeremy Klein
b0f9bd21a2 Merge "Rename entitlement callback to adhere to API guidelines."
am: a3c10cd22b

Change-Id: If58d5724000fba5e1d794a98ccc89b73ce842f4a
2019-03-12 22:39:53 -07:00
Chalard Jean
c9996fbf4a Merge "Tell the factory it is already serving a request." am: 40f6974c7a
am: 183de75174

Change-Id: I8c89110d3b8d55fb8c516a966f4726d4059a098e
2019-03-12 22:21:24 -07:00
Xiao Ma
50caf2e4c4 Merge "[KA13]: add unit test for exposed TCP socket keepalive API." am: a0b41a33e0 am: c8131b1668
am: 3893672a94

Change-Id: Ib2b2474a74e2e84b3bb75c36b518ad48009065af
2019-03-12 22:19:28 -07:00
Ian Kasprzak
40088b623f Merge "Temporarily disable flaky test." am: d146d717c7
am: 3bab305ed9

Change-Id: Ice8e6cd6cad901ca937ca0953049c2f9c83548f8
2019-03-12 22:15:44 -07:00
Xiao Ma
3893672a94 Merge "[KA13]: add unit test for exposed TCP socket keepalive API." am: a0b41a33e0
am: c8131b1668

Change-Id: I2a2061df07612a9415528e18c6f741e750127adb
2019-03-12 22:01:06 -07:00
Treehugger Robot
a3c10cd22b Merge "Rename entitlement callback to adhere to API guidelines." 2019-03-13 04:48:24 +00:00
Chalard Jean
183de75174 Merge "Tell the factory it is already serving a request."
am: 40f6974c7a

Change-Id: I4c3948c2e7098668cf881d3f31fda87be1250828
2019-03-12 21:42:18 -07:00
Ian Kasprzak
3bab305ed9 Merge "Temporarily disable flaky test."
am: d146d717c7

Change-Id: Ie482f459c2f8bce40098657daa39efccfdf2bcd3
2019-03-12 21:38:43 -07:00
Xiao Ma
c8131b1668 Merge "[KA13]: add unit test for exposed TCP socket keepalive API."
am: a0b41a33e0

Change-Id: I79fb97913e8b69c525733dcaec59a60ac6b980b6
2019-03-12 21:29:48 -07:00
Benedict Wong
7f6071dc6e Integrate testNetworkService and Manager with Connectivity stack
This change adds TestAPIs for tests to retrive an instance of
ConnectivityManager, allowing it to build test TUN interfaces, as well
as test networks.

This also integrates the TestNetwork types with ConnectivityManager,
creating virtual networks if the network agent is a test agent.

Bug: 72950854
Test: Compiles, CTS tests using this passing correctly
Change-Id: Ic1a04aa66014d1c66a74e65dbace3218437403ae
Merged-In: I741ef9cdf4bd4125d9129af3a030edf32f438e4f
2019-03-13 02:26:30 +00:00
Benedict Wong
8e972f5b2c Integrate testNetworkService and Manager with Connectivity stack
This change adds TestAPIs for tests to retrive an instance of
ConnectivityManager, allowing it to build test TUN interfaces, as well
as test networks.

This also integrates the TestNetwork types with ConnectivityManager,
creating virtual networks if the network agent is a test agent.

Bug: 72950854
Test: Compiles, CTS tests using this passing correctly
Change-Id: I741ef9cdf4bd4125d9129af3a030edf32f438e4f
2019-03-12 19:21:28 -07:00
Chalard Jean
40f6974c7a Merge "Tell the factory it is already serving a request." 2019-03-13 02:07:29 +00:00
Ian Kasprzak
d146d717c7 Merge "Temporarily disable flaky test." 2019-03-13 01:52:21 +00:00
Xiao Ma
a0b41a33e0 Merge "[KA13]: add unit test for exposed TCP socket keepalive API." 2019-03-13 01:13:08 +00:00
Lorenzo Colitti
dc1e7d9bba Temporarily disable flaky test.
Test: None
Bug: 128426024
Change-Id: Id88bf452f41f512703d5831e357d9ba72dc5b911
2019-03-13 09:23:54 +09:00
Jeremy Klein
a9aad90398 Rename entitlement callback to adhere to API guidelines.
The method for OnTetheringEntitlementResultListener needs to be
onTetheringEntitlementResult in order to meet our API guidelines:

"Use Listener when there is a single callback method and there will
never be any others. It should be an interface whose name is the same
as the callback method plus Listener."

Bug: 126392011
Change-Id: I9a883765541ae853c4eb3bd52c9d93a7af16e661
Test: Manual build
2019-03-12 13:36:21 -07:00
Chalard Jean
44689aab3b Tell the factory it is already serving a request.
This is a cherry-pick of ag/607226 that has been rebased on
top of four years of changes and with comments addressed.

Gives each factory a serial number and propagates it to every
NetworkAgent so when a score comes back indicating a request is
being handled the factory can account for it properly.

Without this, a new request that's already handled by a network
offered by a factory will not cause an increment of the factorys
ref count. Concretely this results in issues like the RAT icon
not being displayed in spite of the network actually being up
and usable.

This will be ported to AOSP as soon as possible, but immediately
some master-only WiFi tests need to be adjusted with this change
which would not let me submit to AOSP.

Bug: 18637384
Bug: 29030667
Test: manual
Test: atest frameworks/opt/telephony/tests/telephonytests
Test: atest frameworks-net
Test: atest CtsNetTestCases CtsHostsideNetworkTests
Change-Id: I597ac588f76dd507512ff02868fd1310b7e63f7e
Merged-In: I597ac588f76dd507512ff02868fd1310b7e63f7e
2019-03-12 21:47:21 +09:00
Chalard Jean
b04e188860 [automerger skipped] Merge "[CS] Support "instant failure" from factories" am: 6e6bca7632 am: da8e8e4be0
am: 2224f6110b -s ours
am skip reason: change_id I9bce0f4d85fa8cad7f8a9998819f945b778c5ac5 with SHA1 2efc554d92 is in history

Change-Id: I8f82d119a7a940b190fecd665e47076404d47fd8
2019-03-12 05:44:42 -07:00