Commit graph

13,045 commits

Message SHA1
Merge "Fix legacy APIs when VPN switches to suspended underlying network." am: 83563fd735 am: d892e45c9b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547497

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I174ab03efc5291c58aa2842831ba2cd62381cf43

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2021-01-28 07:42:30 +00:00
edd29a2f23
Merge "Replace hidden getFileDescriptor$()" am: f13926d8dc am: 6d0e73ed67
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553966

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id15d49eb46923d3d5c0433babeceea9fec21386c

Chiachang Wang   authored and   Automerger Merge Worker   commited 2021-01-28 07:32:11 +00:00
72f68cc2f7
Merge "[Mainline] Migrate TextUtils#emptyIfNull" am: a4520fd260 am: 59452b2ad4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550514

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie90c6d0245703243f66a9bc2e4d0bf512b3e6339

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-01-28 07:31:49 +00:00
ac4ababa1b
Merge "Fix legacy APIs when VPN switches to suspended underlying network." am: 83563fd735
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547497

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I385f93ef5fc3a627fcc2ae827c72e0785c464d8f

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2021-01-28 07:22:25 +00:00
d892e45c9b
Merge "Replace hidden getFileDescriptor$()" am: f13926d8dc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553966

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib6f87447485fd0a4ee008bcabea80b4827fdd99b

Chiachang Wang   authored and   Automerger Merge Worker   commited 2021-01-28 07:15:15 +00:00
6d0e73ed67
Merge "Fix legacy APIs when VPN switches to suspended underlying network."
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2021-01-28 07:07:37 +00:00
83563fd735
Merge "[Mainline] Migrate TextUtils#emptyIfNull" am: a4520fd260
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550514

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ae1d067d23fb87d97f326f6da29ddf3a022a821

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-01-28 07:04:48 +00:00
59452b2ad4
Merge "Replace hidden getFileDescriptor$()"
Chiachang Wang   authored and   Gerrit Code Review   commited 2021-01-28 06:36:11 +00:00
f13926d8dc
Note network interfaces based on transport
Instead of classifying interfaces by network type in BatteryStats,
classify them based on the transports array provided by the
NetworkAgent.

Network types are deprecated and transports should be used instead. This
change allows BatteryStats to stop depending on unstable APIs such as
isNetworkTypeMobile.

This change also updates nullability annotations in ConnectivityService
and NetworkAgentInfo to show that the NetworkCapabilities are non-null
(as provided by the network agent) when calling
noteNetworkInterfaceTransports.

Bug: 174436414
Test: atest
  atest ConnectivityServiceTest#testBatteryStatsNetworkType \
      --rerun-until-failure 40

Merged-In: I4e928fac8a57a9b1fc758a44af2a5719b8c871b8

Change-Id: I4e928fac8a57a9b1fc758a44af2a5719b8c871b8

Remi NGUYEN VAN   commited 2021-01-28 15:10:54 +09:00
afd7560b29
Merge "[Mainline] Migrate TextUtils#emptyIfNull"
Treehugger Robot   authored and   Gerrit Code Review   commited 2021-01-28 06:05:08 +00:00
a4520fd260
Merge "Use createStringArray instead of readStringArray" am: d1a04ba095 am: a9090b57cf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559093

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1631856cb2324f5295f834ce8ff2f6276d15a759

Lucas Lin   authored and   Automerger Merge Worker   commited 2021-01-28 05:01:27 +00:00
da20373654
Merge "Check if NetworkSpecifier is an instance of MatchAllNetworkSpecifier" am: d15fcc3048 am: b96b07febe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556546

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I061c38c83eedf9235d85c4353e88b72117d93b86

Lucas Lin   authored and   Automerger Merge Worker   commited 2021-01-28 05:01:00 +00:00
0c2e799c80
Merge "Use createStringArray instead of readStringArray" am: d1a04ba095
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559093

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38445a56180675c48055fc4256ea238c2b86fabe

Lucas Lin   authored and   Automerger Merge Worker   commited 2021-01-28 04:31:18 +00:00
a9090b57cf
Merge "Check if NetworkSpecifier is an instance of MatchAllNetworkSpecifier" am: d15fcc3048
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556546

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd01df52928e13717eae903c49e201f7bf39940e

Lucas Lin   authored and   Automerger Merge Worker   commited 2021-01-28 04:28:10 +00:00
b96b07febe
Merge "Use createStringArray instead of readStringArray"
Lucas Lin   authored and   Gerrit Code Review   commited 2021-01-28 04:04:10 +00:00
d1a04ba095
Use createStringArray instead of readStringArray
To prevent ProxyInfo calling hidden API, use public one -
Parcel#createStringArray() instead.

Bug: 170598012
Test: atest FrameworksNetTests
Change-Id: I1a5376872d743e1863982bb95d579aeba7159d33

lucaslin   authored and   Lucas Lin   commited 2021-01-28 04:03:59 +00:00
cee4354c1d
Merge "Check if NetworkSpecifier is an instance of MatchAllNetworkSpecifier"
Lucas Lin   authored and   Gerrit Code Review   commited 2021-01-28 04:01:49 +00:00
d15fcc3048
Replace hidden getFileDescriptor$()
It's the preparation for the incoming ConnectivityService
mainline. The mainline modules can not access hidden APIs.
Thus, the hidden APIs usage should be removed.

The getFileDescriptor$() in Socket or DatagramSocket is
hidden for internal usage. It should be used in a module and
not prefer to expose as an API. Thus, replace it with
ParcelFileDescriptor APIs to get the fd via
ParcelFileDescriptor.

Bug: 170598012
Test: atest FrameworksNetTests
Change-Id: I05b31a48315e7e6d95e22123103e544a7136a449

Chiachang Wang   commited 2021-01-28 11:33:13 +08:00
0bb339732d
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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-01-27 13:57:34 +00:00
85c56d4826
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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-01-27 13:11:28 +00:00
2b6868d243
Merge "[FUI03] No-op refactoring of VpnInfo"
Treehugger Robot   authored and   Gerrit Code Review   commited 2021-01-27 11:47:34 +00:00
c1140f2a33
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

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-01-27 08:27:55 +00:00
0f98098600
[VCN01] Add NOT_VCN_MANAGED capability
Add new capability to indicate whether a network is
managed by Virtual Carrier Network (VCN). This is needed
to identify networks between VCN managed network and
others. And this capability will be:
  1. mutable
  2. requestable
  3. set by default for network agents and requests
  4. allowed for test networks

Note that this commit is identical to aosp/1529959 except the
capability remains hidden to address the javadoc problem first.
And this CL also needs to be bound with the counter part change
to prevent build breakage.

Test: 1. atest FrameworksNetTests CtsNetTestCases
      2. adb shell dumpsys connectivity
      3. atest ConnectivityServiceTest#testLoseMutableAndRequestableCaps
Bug: 175662146

Change-Id: I37a6f492c2aba72836e36851b50b67398f8bdd36

Junyu Lai   authored and   junyulai   commited 2021-01-27 16:13:01 +08:00
120e49e971
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

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-01-27 07:50:14 +00:00
71bcb81640
Check if NetworkSpecifier is an instance of MatchAllNetworkSpecifier
To prevent mainline module related file to access a hidden API,
check whether the NetworkSpecifier is an instance of
MatchAllNetworkSpecifier by itself.

Bug: 172183305
Test: atest FrameworksNetTests
Change-Id: I4d49cb70ff3c8a7e1ffa32e38207c74a6375e51a

lucaslin   commited 2021-01-27 15:32:43 +08:00
61ad5f342e
Merge "Move connectivity-sources to frameworks/base"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2021-01-27 07:15:05 +00:00
82a30b6bbe
[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

junyulai   commited 2021-01-27 15:03:06 +08:00
bd7f3cd75b
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

James Mattis   authored and   Automerger Merge Worker   commited 2021-01-27 05:45:23 +00:00
7a7e2bb6a1
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

James Mattis   authored and   Automerger Merge Worker   commited 2021-01-27 05:33:07 +00:00
f07220e8f5
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

James Mattis   authored and   Gerrit Code Review   commited 2021-01-27 04:50:43 +00:00
4c69988898
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

Chiachang Wang   authored and   Automerger Merge Worker   commited 2021-01-27 03:38:00 +00:00
669715a9c5
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

Chiachang Wang   authored and   Automerger Merge Worker   commited 2021-01-27 03:10:44 +00:00
c1e552c667
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

James Mattis   commited 2021-01-26 18:44:45 -08:00
08131f3446
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

James Mattis   commited 2021-01-26 18:44:32 -08:00
7b26bba8de
Merge "Update jni to get int descriptor in native layer"
Chiachang Wang   authored and   Gerrit Code Review   commited 2021-01-27 02:44:29 +00:00
332aae3a6e
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

Chiachang Wang   commited 2021-01-27 02:44:14 +00:00
30199ca9f8
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

Paul Hu   authored and   Automerger Merge Worker   commited 2021-01-27 01:01:39 +00:00
b24091856f
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

Paul Hu   authored and   Automerger Merge Worker   commited 2021-01-27 01:01:37 +00:00
45a771a50f
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

Paul Hu   authored and   Automerger Merge Worker   commited 2021-01-27 00:38:32 +00:00
438f45fc13
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

Paul Hu   authored and   Automerger Merge Worker   commited 2021-01-27 00:33:36 +00:00
c8341e807d
Merge "Fix FrameworksNetIntegrationTests failure"
Paul Hu   authored and   Gerrit Code Review   commited 2021-01-27 00:04:09 +00:00
4071a8ccb1
Merge "Revert^2 "Replace Context#sendStickyBroadcastAsUser()""
Paul Hu   authored and   Gerrit Code Review   commited 2021-01-27 00:04:09 +00:00
d07d47e255
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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-01-26 23:08:40 +00:00
8b8a8fc5de
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

James Mattis   commited 2021-01-26 12:33:43 -08:00
757e0e8b3e
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

James Mattis   commited 2021-01-26 12:33:37 -08:00
622428ceea
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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-01-26 13:49:20 +00:00
efeaa56ba6
Merge changes I713bc2ec,Ib9ab07c9
* changes:
  [FUI05] Remove wimax data usage unit test
  [FUI14] Get SSID from NetworkCapabilities

Treehugger Robot   authored and   Gerrit Code Review   commited 2021-01-26 13:13:24 +00:00
c5a7a59483
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

Paul Hu   commited 2021-01-26 02:53:06 +00:00
32fd208a71
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

Daniel Bright   authored and   Automerger Merge Worker   commited 2021-01-26 00:04:11 +00:00
22b01d88ca
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

Daniel Bright   authored and   Automerger Merge Worker   commited 2021-01-25 18:40:06 +00:00
c6e47cad53