Commit Graph

12770 Commits

Author SHA1 Message Date
Treehugger Robot
524489652e Merge "[FUI03] No-op refactoring of VpnInfo" am: c1140f2a33 am: 2b6868d243 am: 85c56d4826
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05e6b14fca44919610317831c147413b0a431224
2021-01-27 14:16:00 +00:00
Treehugger Robot
85c56d4826 Merge "[FUI03] No-op refactoring of VpnInfo" am: c1140f2a33 am: 2b6868d243
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic947ae7aabd4e0095e94977dffb66c2f6b7b9e57
2021-01-27 13:57:34 +00:00
Treehugger Robot
2b6868d243 Merge "[FUI03] No-op refactoring of VpnInfo" am: c1140f2a33
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae15ffcf1fbf31ab004a36eb662f39e4439146d0
2021-01-27 13:11:28 +00:00
Treehugger Robot
c1140f2a33 Merge "[FUI03] No-op refactoring of VpnInfo" 2021-01-27 11:47:34 +00:00
Remi NGUYEN VAN
f773ee85d1 Merge "Move connectivity-sources to frameworks/base" am: 82a30b6bbe am: 71bcb81640 am: 0f98098600
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552065

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic9ccdcbd727ab8573aadeb5b7c8a9eb0569acac4
2021-01-27 08:49:37 +00:00
Remi NGUYEN VAN
0f98098600 Merge "Move connectivity-sources to frameworks/base" am: 82a30b6bbe am: 71bcb81640
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552065

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I086ea4d13012e89a9ab9c006107fc24cbcb33db9
2021-01-27 08:27:55 +00:00
James Mattis
544ae6e8fa Merge changes Ic67cff95,Id7a6175c,I3d6896f5,Iaff727e7 am: 4c69988898 am: f07220e8f5 am: 7a7e2bb6a1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527006

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I79c5b8919396827d281fcd04dced649847e9a038
2021-01-27 08:05:27 +00:00
Chiachang Wang
e5648441c4 Merge "Update jni to get int descriptor in native layer" am: 332aae3a6e am: c1e552c667 am: 669715a9c5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553967

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc0ac9def6a0a05658235b61f36ef8829906c341
2021-01-27 08:04:37 +00:00
Paul Hu
79ad2808b9 Merge "Fix FrameworksNetIntegrationTests failure" am: 4071a8ccb1 am: 438f45fc13 am: b24091856f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559105

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a8b00c2f1b2d809e0aa3aa9f5a5cee58480fccd
2021-01-27 08:01:10 +00:00
Paul Hu
9a56d89a0b Merge "Revert^2 "Replace Context#sendStickyBroadcastAsUser()"" am: d07d47e255 am: c8341e807d am: 45a771a50f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556143

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I02ff8df90f86e25c8845301e11f351407bee0178
2021-01-27 08:01:01 +00:00
Treehugger Robot
6d457c9156 Merge changes I713bc2ec,Ib9ab07c9 am: c5a7a59483 am: efeaa56ba6 am: 8b8a8fc5de
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537264

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b291a4e82b89d3808e9bcd980d5b2aa4d2b1b71
2021-01-27 07:53:30 +00:00
Remi NGUYEN VAN
71bcb81640 Merge "Move connectivity-sources to frameworks/base" am: 82a30b6bbe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552065

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5839df398fe834f527c2ed4732220592be1762ab
2021-01-27 07:50:14 +00:00
Remi NGUYEN VAN
82a30b6bbe Merge "Move connectivity-sources to frameworks/base" 2021-01-27 07:15:05 +00:00
junyulai
bd7f3cd75b [FUI03] No-op refactoring of VpnInfo
As a preparation of exposing system API. This patch does some
harmless refactoring, which includes:
  1. Move VpnInfo to android.net
  2. Add nullability annotations
  3. Make members final

Bug: 174123988
Test: TH
Change-Id: I1530bb45d0e84c28c6deac33596bc686058afc0d
2021-01-27 15:03:06 +08:00
James Mattis
7a7e2bb6a1 Merge changes Ic67cff95,Id7a6175c,I3d6896f5,Iaff727e7 am: 4c69988898 am: f07220e8f5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527006

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If95476bce2e340fb95a64f314ba0fef420f14294
2021-01-27 05:45:23 +00:00
James Mattis
f07220e8f5 Merge changes Ic67cff95,Id7a6175c,I3d6896f5,Iaff727e7 am: 4c69988898
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527006

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I88af6ecc2d8cb7695029504b842e08d622f3d2ed
2021-01-27 05:33:07 +00:00
James Mattis
4c69988898 Merge changes Ic67cff95,Id7a6175c,I3d6896f5,Iaff727e7
* changes:
  Updates to handler logic for multilayer requests
  Update to sendAllRequestsToProvider for Multilayer
  Multilayer request updates to request callbacks
  Multilayer support when NAI requests are updated
2021-01-27 04:50:43 +00:00
Chiachang Wang
669715a9c5 Merge "Update jni to get int descriptor in native layer" am: 332aae3a6e am: c1e552c667
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553967

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4415671e964346ea31844d0a7ed65459ffe338b2
2021-01-27 03:38:00 +00:00
Chiachang Wang
c1e552c667 Merge "Update jni to get int descriptor in native layer" am: 332aae3a6e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553967

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd8dbb868577eb071f950c7e9afb25b929e9441c
2021-01-27 03:10:44 +00:00
James Mattis
08131f3446 Updates to handler logic for multilayer requests
Updates to ConnectivityService network request handler's logic to support
(or disallow support of) multilayer network requests.

Bug: 175239920
Bug: 171991028
Test: atest FrameworksNetTests
atest NetworkStackTests
atest FrameworksNetIntegrationTests
atest NetworkStackIntegrationTests
atest CtsNetTestCasesLatestSdk

Change-Id: Ic67cff950d72745d6508a0a037bd33f932d5132c
2021-01-26 18:44:45 -08:00
James Mattis
7b26bba8de Update to sendAllRequestsToProvider for Multilayer
Updates to ConnectivityService.sendAllRequestsToProvider to support
Multilayer requests.

Bug: 175051182
Bug: 171991028
Test: atest FrameworksNetTests
atest FrameworksNetIntegrationTests
atest CtsNetTestCasesLatestSdk

Change-Id: Id7a6175cee28d2de1f6194cd0fc8c739d667427d
2021-01-26 18:44:32 -08:00
Chiachang Wang
332aae3a6e Merge "Update jni to get int descriptor in native layer" 2021-01-27 02:44:29 +00:00
Chiachang Wang
30199ca9f8 Update jni to get int descriptor in native layer
ConnectivityService is going to become a mainline module which
can not access the hidden APIs. The int descriptor of a
FileDescriptor is hidden for internal use only. The Network and
NetworkUtls will be parts of CS module. The corresponding usage
should be removed. There is no way in a module to access the
descriptor, so update the jni to set a FileDescriptor to native
to get the int descriptor inside the platform.

Also, update the other references in android_net_NetUtils for
getting fd to use the NDK functions in the libnativehelper.

Bug: 170598012
Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
Test: manually connect to a VPN
Change-Id: I2143c079feac53917a6e7bf7422f3180f51437fb
2021-01-27 02:44:14 +00:00
Paul Hu
b24091856f Merge "Fix FrameworksNetIntegrationTests failure" am: 4071a8ccb1 am: 438f45fc13
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559105

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib4172f2b4eaec4f154bc8092531638cea3526d5f
2021-01-27 01:01:39 +00:00
Paul Hu
45a771a50f Merge "Revert^2 "Replace Context#sendStickyBroadcastAsUser()"" am: d07d47e255 am: c8341e807d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556143

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12d09faf926b513cd4f3db21703a673f8bd832bf
2021-01-27 01:01:37 +00:00
Paul Hu
438f45fc13 Merge "Fix FrameworksNetIntegrationTests failure" am: 4071a8ccb1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559105

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e43ec9f2061e4a67c5d78a3cab331ed8b13b991
2021-01-27 00:38:32 +00:00
Paul Hu
c8341e807d Merge "Revert^2 "Replace Context#sendStickyBroadcastAsUser()"" am: d07d47e255
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556143

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0bd4c977d13d2328cab480ca27c59de6fc4856a6
2021-01-27 00:33:36 +00:00
Paul Hu
4071a8ccb1 Merge "Fix FrameworksNetIntegrationTests failure" 2021-01-27 00:04:09 +00:00
Paul Hu
d07d47e255 Merge "Revert^2 "Replace Context#sendStickyBroadcastAsUser()"" 2021-01-27 00:04:09 +00:00
Treehugger Robot
8b8a8fc5de Merge changes I713bc2ec,Ib9ab07c9 am: c5a7a59483 am: efeaa56ba6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537264

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I31e71444d5b40981058b5a4152e5f1a0521527d0
2021-01-26 23:08:40 +00:00
James Mattis
757e0e8b3e Multilayer request updates to request callbacks
Updated to ConnectivityService to support multilayer requests when
sending request level callbacks.

Bug: 174797702
Bug: 171991028
Test: atest FrameworksNetTests
atest NetworkStackTests
atest FrameworksNetIntegrationTests
atest NetworkStackIntegrationTests
atest CtsNetTestCasesLatestSdk

Change-Id: I3d6896f5705509bcfff5544d2eb13c31feaf1937
2021-01-26 12:33:43 -08:00
James Mattis
622428ceea Multilayer support when NAI requests are updated
Updates to ConnectivityService to support multilayer requests in any
flows which a NetworkAgentInfo has a NetworkRequest added/removed. This
would include both 'listen' and 'request' types of NetworkRequest
objects.

Bug: 174271773
Bug: 171991028
Test: atest FrameworksNetTests
atest NetworkStackTests
atest FrameworksNetIntegrationTests
atest NetworkStackIntegrationTests
atest CtsNetTestCasesLatestSdk

Change-Id: Iaff727e792828684e6ad4d07d0081e27992031be
2021-01-26 12:33:37 -08:00
Treehugger Robot
efeaa56ba6 Merge changes I713bc2ec,Ib9ab07c9 am: c5a7a59483
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537264

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I27116d11a4a61c2ca76f687d8d47a4a973ae1e77
2021-01-26 13:49:20 +00:00
Treehugger Robot
c5a7a59483 Merge changes I713bc2ec,Ib9ab07c9
* changes:
  [FUI05] Remove wimax data usage unit test
  [FUI14] Get SSID from NetworkCapabilities
2021-01-26 13:13:24 +00:00
Remi NGUYEN VAN
f4ae885dbd Merge "Revert "Note network interfaces based on transport"" 2021-01-26 04:25:56 +00:00
Remi NGUYEN VAN
f9054ed6bd Revert "Note network interfaces based on transport"
This reverts commit 6e1b16c9fe.

Reason for revert: Broke build of tests: b/178441996

Change-Id: Idaf35fa02f76852fa8134b0d505467007f6d0f60
2021-01-26 04:22:54 +00:00
Remi NGUYEN VAN
5e420d9ef4 Merge "Note network interfaces based on transport" 2021-01-26 03:20:21 +00:00
Paul Hu
32fd208a71 Revert^2 "Replace Context#sendStickyBroadcastAsUser()"
ConnectivityService is using Context#sendStickyBroadcastAsUser
to send sticky broadcast but this API is not able to call after
it becomes part of Connectivity mainline module. Thus, replace it
with Context#sendStickyBroadcast.

The original commit was reverted because of a test failure. This
reverted commit is bound to the fix and will submit together.

Bug: 177223402
Change-Id: I75b8494e8ee30f484f33e9a9a660c7f9ad75f368
Test: atest FrameworksNetTests
Test: atest CtsNetTestCases
Test: atest CtsNetApi23TestCases
Test: atest FrameworksNetIntegrationTests
2021-01-26 02:53:06 +00:00
Daniel Bright
946f6661c2 Merge "Add method to match address \ port with QosFilter" am: 591fe5327c am: c6e47cad53 am: 22b01d88ca
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1510591

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id9951a0be8821192e3fb403787d096c538d691cf
2021-01-26 00:22:58 +00:00
Daniel Bright
22b01d88ca Merge "Add method to match address \ port with QosFilter" am: 591fe5327c am: c6e47cad53
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1510591

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I31b6fc16a31c45a9f44dc90872fd1b1fc03fcc14
2021-01-26 00:04:11 +00:00
Daniel Bright
c6e47cad53 Merge "Add method to match address \ port with QosFilter" am: 591fe5327c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1510591

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ccdf5afb966d44852ea34f7d3284470f002e539
2021-01-25 18:40:06 +00:00
Will Osborn
c61f3c3848 Merge "Revert "Replace Context#sendStickyBroadcastAsUser()"" am: 42a9366c6f am: 5f323ee65b am: 5720e85c3d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556090

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e347ed000fcec2a67047211fad81cae12de054c
2021-01-25 18:26:50 +00:00
Will Osborn
5720e85c3d Merge "Revert "Replace Context#sendStickyBroadcastAsUser()"" am: 42a9366c6f am: 5f323ee65b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556090

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3583681f6982933c855e12583a60c4c000d6a6fa
2021-01-25 18:06:14 +00:00
Daniel Bright
591fe5327c Merge "Add method to match address \ port with QosFilter" 2021-01-25 18:03:32 +00:00
Will Osborn
5f323ee65b Merge "Revert "Replace Context#sendStickyBroadcastAsUser()"" am: 42a9366c6f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556090

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf3590c2457434fb10ed68213ff47e5c8fffb4d7
2021-01-25 17:35:21 +00:00
Will Osborn
42a9366c6f Merge "Revert "Replace Context#sendStickyBroadcastAsUser()"" 2021-01-25 17:20:29 +00:00
paulhu
b15a22e5b9 Fix FrameworksNetIntegrationTests failure
The test is broken because CS is using
sendStickyBroadcast with all users context instead of
sendStickyBroadcastAsUser to send sticky broadcast. So update
related code on ConnectivityServiceIntegrationTest.

Bug: 178367782
Test: atest FrameworksNetIntegrationTests
      atest FrameworksNetTests
Change-Id: I7ad94fa31ea16025e6ad62d41235978f45be5d99
2021-01-25 23:40:06 +08:00
Will Osborn
3eaba31d42 Revert "Replace Context#sendStickyBroadcastAsUser()"
This reverts commit c529710329.

Reason for revert: DroidMonitor: Potential culprit for Bug http://b/178367782 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: I7fd74bf481febf1cba8b6c8fbf01c4908f847606
2021-01-25 14:34:30 +00:00
Paul Hu
e371dcf727 Merge "Replace Context#sendStickyBroadcastAsUser()" am: 0a6682146c am: 2c7d1107f9 am: 110dff506a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552316

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0580d039740e0c9e4665d1cb1aef581935d7e57c
2021-01-25 07:13:08 +00:00
Paul Hu
110dff506a Merge "Replace Context#sendStickyBroadcastAsUser()" am: 0a6682146c am: 2c7d1107f9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552316

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8e2eb504f76b3cb0e9a3125144f591666b2a6b59
2021-01-25 06:57:48 +00:00