Commit graph android_packages_modules_Co.../framework
Message SHA1
Merge changes Iabad7300,I85363e28
* changes:
  Stubbed setOemNetworkPreference in Connectivity
  Update OemNetworkPreferences to use 1:1 Map

James Mattis   authored and   Gerrit Code Review   commited 2021-02-06 04:33:51 +00:00
e3e711d775
Merge "Remove legacy network factories" am: 2bd97d70e2 am: 05a710816f am: df1860329b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574684

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I04893919701674bdaec026a14207bfb350a3cd08

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-02-05 10:50:14 +00:00
ded18b9d13
Merge "Add @Nullable to Object#equals()"
Treehugger Robot   authored and   Gerrit Code Review   commited 2021-02-05 09:36:41 +00:00
6a84d58b7f
Merge "Remove legacy network factories"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2021-02-05 08:23:19 +00:00
2bd97d70e2
Add @Nullable to Object#equals()
This is a partial cherry-pick of change:
I5eedb571c9d78862115dfdc5dae1cf2a35343580

for connectivity classes.

Bug: 170883422
Test: m
Merged-In: I5eedb571c9d78862115dfdc5dae1cf2a35343580
Change-Id: I7dc661863b73f4198ddb4f3a1566583d0f07db3c

Roman Kalukiewicz   authored and   Remi NGUYEN VAN   commited 2021-02-05 07:28:44 +00:00
0b6f2908c5
Stubbed setOemNetworkPreference in Connectivity
Stubbed setOemNetworkPreference() in ConnectivityService and connected
it to ConnectivityManager.

Bug: 176495254
Bug: 176494815
Test: atest FrameworksNetTests
atest FrameworksNetIntegrationTests
atest CtsNetTestCasesLatestSdk

Change-Id: Iabad7300a8b058e1edcb0defab8a031d21e6433c

James Mattis   commited 2021-02-04 20:12:40 -08:00
452c6ffa61
API: Suppress existing NullableCollections lints am: 515b26ae98 am: b59b4d91dc am: 98eb82a6d3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566096

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I314b97d2677f26b0a9c09a52918df49096450aea

Adrian Roos   authored and   Automerger Merge Worker   commited 2021-02-04 17:09:38 +00:00
359549af2f
API: Suppress existing NullableCollections lints am: 515b26ae98
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566096

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d47151b7e26e82706f2d94a13c4067fe71fc168

Adrian Roos   authored and   Automerger Merge Worker   commited 2021-02-04 16:19:34 +00:00
b59b4d91dc
Merge changes from topic "nullablecollection"
* changes:
  API: Suppress existing NullableCollections lints (TaskOrganizer)
  API: Suppress existing NullableCollections lints

Adrian Roos   authored and   Gerrit Code Review   commited 2021-02-04 15:53:34 +00:00
d667ef7737
[VCN07] Bypass VCN for non-internet app accessible cellular services
Deduce the NET_CAPABILITY_NOT_VCN_MANAGED capability from other
capabilities and user intention, which includes:
   1. For the requests that don't have anything besides
      VCN_SUPPORTED_CAPABILITIES, add the NOT_VCN_MANAGED to
      allow the callers automatically utilize VCN networks
      if available.
   2. For the requests that explicitly add or remove
      NOT_VCN_MANAGED,  do not alter them to allow user fire
      request that suits their need.

Test: atest NetworkRequestTest#testBypassingVcnForNonInternetRequest
Bug: 175662146
Change-Id: I9936894b9530a22fb186cfd25cbee0fced65b72b

junyulai   commited 2021-02-04 17:07:23 +08:00
062b648099
Remove legacy network factories
Nothing on the system is using registerNetworkFactory,
unregisterNetworkFactory at the moment.

registerNetworkFactory, unregisterNetworkFactory are protected by
signature permissions, so could not be used by anything outside of the
system.

Remove the two methods and the underlying support for this legacy,
deprecated mechanism.

Bug: 179229316
Test: atest FrameworksNetTests
Change-Id: I7cdc9eed67f846c8774474af038133040aeccab3

Remi NGUYEN VAN   commited 2021-02-04 18:04:43 +09:00
470efc161d
Merge "Reimplement [read|write]ArraySet of Parcel inside NetworkCapabilities" am: d88ef71aa4 am: a1eb910ead am: 6e81f01538
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556547

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ad30835e454c5003b36d0a87e0c34c88b2438bf

Lucas Lin   authored and   Automerger Merge Worker   commited 2021-02-04 08:18:40 +00:00
ddb24b3095
Merge "Reimplement [read|write]ArraySet of Parcel inside NetworkCapabilities"
Lucas Lin   authored and   Gerrit Code Review   commited 2021-02-04 06:12:14 +00:00
d88ef71aa4
Merge "Use formal API for ActivityThread to set proxy" into sc-dev
Remi NGUYEN VAN   authored and   Android (Google) Code Review   commited 2021-02-04 02:44:38 +00:00
a1aefffd2d
Move shared methods to net shared lib
The NetworkUtils.getNetworkPart() method is used by Settings
and wifi. NetworkUtils is inside the incoming connectivity
module. It will become inaccessible outside the module, so
move the shared methods to shared lib and also move the
related helper method.

The corresponding usgae is also updated.

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

Chiachang Wang   commited 2021-02-03 18:47:37 +08:00
a858d3bfeb
Use formal API for ActivityThread to set proxy
Add getProxyForNetwork to the public API, and use ConnectivityManager
APIs from ActivityThread (instead of hidden APIs) to get/set the proxy
for an app process.

getProxyForNetwork allows clients to find which proxy applies, which can
be a global proxy setting or a per-network proxy.

The default proxy is now initialized with getDefaultProxy instead of
getProxyForNetwork(null); this should not make a difference, as nothing
should have called bindProcessToNetwork at that point yet.

Bug: 174436414
Test: m; device boots
Change-Id: Ifb516194ecde1567cea4b6806946091cdcf2f015

Remi NGUYEN VAN   commited 2021-02-03 10:19:25 +09:00
8a831d6e07
Merge "[VCN08] Expose NOT_VCN_MANAGED capability as system API" am: fc1622a827 am: 2562ab4856 am: b57e9b2dcc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563497

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I932566b4bb788925072e57436cd5f5fa7918a32c

Junyu Lai   authored and   Automerger Merge Worker   commited 2021-02-02 15:58:36 +00:00
74418fde45
Merge "[VCN08] Expose NOT_VCN_MANAGED capability as system API"
Junyu Lai   authored and   Gerrit Code Review   commited 2021-02-02 13:57:57 +00:00
fc1622a827
Merge "Remove ArrayUtils usage in connectivity frameworks classes" am: 7cd199f07b am: ace78186e4 am: 0ca0316937
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564776

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia926472336a8abfa6583f29f452838056db932a8

Paul Hu   authored and   Automerger Merge Worker   commited 2021-02-02 10:09:24 +00:00
67c41a05dd
Merge "Remove ArrayUtils usage in connectivity frameworks classes"
Paul Hu   authored and   Gerrit Code Review   commited 2021-02-02 08:47:04 +00:00
7cd199f07b
Merge "Have connectivity self-register manager classes" am: d8c4953e7e am: 98c48f7101 am: f99ed40471
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552657

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a664bb9e9f2f835f148d0102f8b53c010bb7791

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-02-02 06:40:07 +00:00
0d837effb9
Reimplement [read|write]ArraySet of Parcel inside NetworkCapabilities
Both of readArraySet and writeArraySet are hidden APIs inside
Parcel, so reimplement those two methods inside NetworkCapabilities
to prevent calling hidden APIs.

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

lucaslin   commited 2021-02-02 12:57:26 +08:00
f4a7b149c1
[VCN08] Expose NOT_VCN_MANAGED capability as system API
Test: m -j doc-comment-check-docs
Fix: 177299683
Bug: 175662146
Change-Id: Iaa53d21774ea48af5fe339b57bf1235c77f295a0

junyulai   commited 2021-02-02 11:34:09 +08:00
d5c54eca66
API: Suppress existing NullableCollections lints
Bug: 152525509
Bug: 154763999
Test: make checkapi
Change-Id: Iecd0927e6be5496b2fbd1a49396db5439257ffe4

Adrian Roos   commited 2021-02-01 15:04:10 +01:00
515b26ae98
resolve merge conflicts of 546e2e895fc46b32101bd468c516ad3bf7bcac39 to sc-dev
Bug: None, merge conflict
Change-Id: Id07440d6a55111a1a7ddbf3df306f4466073fd1d

Remi NGUYEN VAN   commited 2021-02-01 11:29:28 +00:00
a522fc2ef1
Remove ArrayUtils usage in connectivity frameworks classes
Instead, use CollectionUtils from frameworks/libs/net.

Bug: 174541037
Test: atest FrameworksNetTests
Change-Id: I610e00302cf76510e9e34ac8a9a5f738e5ecd0c7

paulhu   commited 2021-02-01 16:30:08 +08:00
3c2297a2ab
Have connectivity self-register manager classes
As connectivity services are planned to move to a separate module, move
the manager classes registration from SystemServiceRegistry to
ConnectivityServicesRegistrar, using the registerContextAwareService
APIs.

This follows patterns and naming in WifiFrameworkInitializer.

Bug: 171540887
Test: device boots, connectivity working
Change-Id: I62ced1275750c73f209bac8ec3a3204b95695b83

Remi NGUYEN VAN   commited 2021-02-01 17:10:39 +09:00
91444cae56
Move module sources to packages/Connectivity
Files that are planned to be part of the connectivity module are grouped
in packages/Connectivity, so they can be built separately and moved in
one operation with their history into packages/modules/Connectivity.

This places the files in the existing framework-connectivity-sources
filegroup instead of the current framework-core-sources filegroup. Both
are used the same way in framework-non-updatable-sources.

Bug: 171540887
Test: m
Change-Id: I62d9d91574ace6f5c4624035d190260c3126b91e

Remi NGUYEN VAN   commited 2021-02-01 11:52:14 +09:00
fbbccbce69
Move connectivity-sources to frameworks/base
All sources for the connectivity module are being moved to
frameworks/base/packages/Connectivity, so that they can all be moved to
packages/modules/Connectivity in one move keeping history.

INetworkAgent and INetworkAgentRegistry were created in
packages/modules/Connectivity directly, but this makes managing the
sources until the move harder as the module needs to pull sources from
two different locations. Considering that they do not have history to
move, just move them to frameworks/base/packages/Connectivity without
the commit history.

Bug: 171540887
Test: m
Change-Id: Ic4353115a98b6235c2b5d5ce24741223e618d0a6

Remi NGUYEN VAN   commited 2021-01-25 11:47:42 +09:00
66ea68e472
Move connectivity-sources to frameworks/base
All sources for the connectivity module are being moved to
frameworks/base/packages/Connectivity, so that they can all be moved to
packages/modules/Connectivity in one move keeping history.

INetworkAgent and INetworkAgentRegistry were created in
packages/modules/Connectivity directly, but this makes managing the
sources until the move harder as the module needs to pull sources from
two different locations. Considering that they do not have history to
move, just move them to frameworks/base/packages/Connectivity without
the commit history.

Bug: 171540887
Test: m
Change-Id: I1c7e83267014bff29eb938c002d6441332101248

Remi NGUYEN VAN   commited 2021-01-25 11:47:28 +09:00
36840ee2d3
Added aidl for qos callback
Bug: 155176305
Change-Id: I62958d041a8f544dbd98d5434e97ce89f843c5cb

Daniel Bright   commited 2021-01-22 14:03:47 +00:00
c16bfcc7f7
Migrate away from AsyncChannel in NetworkAgent
Use two oneway binder interfaces instead.
The interfaces post messages to handlers as was implemented before, but
provide a more strictly defined interface, with less hops between
NetworkAgent, AsyncChannel, and ConnectivityService.

Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
Merged-In: Ica51d0179bcb3b4e314d2c3e85709aead6ca5657

Change-Id: Ica51d0179bcb3b4e314d2c3e85709aead6ca5657

Chalard Jean   authored and   Remi NGUYEN VAN   commited 2020-12-25 11:11:32 +09:00
4f896db6ff