Commit Graph

928 Commits

Author SHA1 Message Date
Patrick Rohr
746d082279 Add Nullable IpConfiguration to ethernet update request
This is not currently used by anyone, but will allow us to only update
NetworkCapabilities in the future. This could be useful for testing.

Test: atest EthernetServiceTests
Bug: 220017952
Change-Id: I9697399bad2bfe66c6f328064be75f4dfa10af81
2022-03-16 20:28:45 +01:00
Patrick Rohr
7215598852 Add Nullable IpConfiguration to ethernet update request
This is not currently used by anyone, but will allow us to only update
NetworkCapabilities in the future. This could be useful for testing.

Test: atest EthernetServiceTests
Bug: 220017952
Change-Id: I9697399bad2bfe66c6f328064be75f4dfa10af81
2022-03-16 20:28:45 +01:00
Xinyi Zhou
841bedcc3b Merge "Update system-current.txt to resolve API council comments" into tm-dev 2022-03-16 18:18:46 +00:00
Xiao Ma
22c83111ec Build ethernet framework source into framework-connectivity-tiramisu am: 0a171c006c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1956052

Change-Id: If7c86d0404571920dddaba492dff4f06448eb141
2022-03-16 17:08:56 +00:00
Patrick Rohr
112f3762bb Merge "Split out the ethernet API surface and use framework-connectivity-t" 2022-03-16 16:03:30 +00:00
Patrick Rohr
cbcf21833f Merge "Split out the ethernet API surface and use framework-connectivity-t" 2022-03-16 16:03:30 +00:00
Patrick Rohr
6dde8ac532 Merge changes from topic "ethernet_mainline"
* changes:
  Fix the NPE thrown when starting Ethernet service in OS lower than T.
  Remove the stub ethernet service from Connectivity module.
  Update hidden API files for EthernetManager API move.
  Provide a stub ethernet service to build in sc-mainline-prod.
  Build ethernet framework source into framework-connectivity-tiramisu
2022-03-16 16:03:30 +00:00
Frank Li
a89e379e00 Merge "[DU04-2]Appropriate changes to the NetworkPolicyManager API" am: 73c476d79d am: 8c4e592d2e am: f946d59035
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2007132

Change-Id: I7e5dc71e1705a7c205c0fd6a7cb57e75cae5a4fc
2022-03-16 13:20:10 +00:00
Frank Li
62bfe3e882 Merge "[DU04-2]Appropriate changes to the NetworkPolicyManager API" 2022-03-16 12:28:24 +00:00
Frank Li
73c476d79d Merge "[DU04-2]Appropriate changes to the NetworkPolicyManager API" 2022-03-16 12:28:24 +00:00
junyulai
5dc94ede39 [MS83.1] Make some APIs module-lib instead of system current
Some of the internal classes are not available for priv-apps.
Thus, make them module-lib instead.

This change also adds some nullability annotations for existing
APIs according to go/android-api-guidelines.

Test: m
Test: m frameworks-base-api-system-current-compat
Fix: 217479745
Change-Id: I18de46b11df7232ab82b9465856fdde621283156
2022-03-16 15:31:51 +08:00
junyulai
b59e5427fd [MS83.2] Make some APIs module-lib instead of system current
Test: m
Ignore-AOSP-First: Avoid merge conflict
Fix: 217479745
Change-Id: Ief3f2304f11b7940a18b98b8533fbca85ffa4dc1
2022-03-16 15:31:26 +08:00
Frank
b9bacae1fc [DU04-2]Appropriate changes to the NetworkPolicyManager API
Divide the NetworkPolicyManager API
notifyStatsProviderWarningOrLimitReached into the following two APIs:
1. notifyStatsProviderWarningReached()
2. notifyStatsProviderLimitReached()

Bug: 216474563
Test: atest NetworkStatsServiceTest NetworkPolicyManagerTest
            NetworkPolicyManagerServiceTest OffloadControllerTest
Change-Id: Ic413eb532b5e24d4a7e2afabdcf643ab6607b1ed
2022-03-16 14:23:50 +08:00
Frank
6e429bec00 [DU04-2]Appropriate changes to the NetworkPolicyManager API
Divide the NetworkPolicyManager API
notifyStatsProviderWarningOrLimitReached into the following two APIs:
1. notifyStatsProviderWarningReached()
2. notifyStatsProviderLimitReached()

Bug: 216474563
Test: atest NetworkStatsServiceTest NetworkPolicyManagerTest
            NetworkPolicyManagerServiceTest OffloadControllerTest
Change-Id: Ic413eb532b5e24d4a7e2afabdcf643ab6607b1ed
2022-03-16 14:23:50 +08:00
Lorenzo Colitti
e1ef6d8259 Merge "Rename setUidForeground to noteUidForeground" am: 8d52f75d38 am: 112efa8a5a am: 1ad828ae91
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2018717

Change-Id: I04612669cde5eea0fef581ab4bcf9274ffe4b57c
2022-03-16 00:37:29 +00:00
Lorenzo Colitti
f2975db5a4 Merge "Rename setUidForeground to noteUidForeground" am: 8b7896b51a am: cf9f545864
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2018880

Change-Id: I8a3ac0a4dcf9201435ad227b36acf4e0f1889f22
2022-03-16 00:37:29 +00:00
Lorenzo Colitti
cf9f545864 Merge "Rename setUidForeground to noteUidForeground" am: 8b7896b51a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2018880

Change-Id: Ibcc236d2807da26a9aeae3eab6d6b10361a58cb5
2022-03-15 23:57:57 +00:00
Lorenzo Colitti
2a4a56b004 Merge "Rename setUidForeground to noteUidForeground" 2022-03-15 23:33:26 +00:00
Lorenzo Colitti
8d52f75d38 Merge "Rename setUidForeground to noteUidForeground" 2022-03-15 23:33:26 +00:00
Lorenzo Colitti
8b7896b51a Merge "Rename setUidForeground to noteUidForeground" 2022-03-15 23:33:26 +00:00
Xinyi Zhou
fe1e4917b3 Update system-current.txt to resolve API council comments
Bug: 216294721
Test: Compiled
Ignore-AOSP-First: nearby_not_in_aosp_yet
CTS-Coverage-Bug: 213364287
Change-Id: I366bf367e5519506f4f3e5966fe61a7f7a2f4903
2022-03-15 14:33:33 -07:00
Aaron Huang
b95515f13f Merge "Let docs tool to list the newly-visible IntDef values" am: 583be3615a am: b4c83efde2 am: 5004245979
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2020536

Change-Id: Idde4985d233a67ea5049b61d6758b314cb8813cd
2022-03-15 05:04:43 +00:00
Aaron Huang
1b60475d2b Merge "Let docs tool to list the newly-visible IntDef values" 2022-03-15 03:55:41 +00:00
Aaron Huang
583be3615a Merge "Let docs tool to list the newly-visible IntDef values" 2022-03-15 03:55:41 +00:00
Xinyi Zhou
74539fb52a Merge "Update system-current.txt and module-lib-current.txt to resolve API council comments" into tm-dev 2022-03-14 22:45:47 +00:00
Xiao Ma
0a171c006c Build ethernet framework source into framework-connectivity-tiramisu
- move ethernet APIs, build it into framework-connectivity-tiramisu
- start ethernet service from ConnectivityServiceInitializer
- fix EthernetManager dependnecy in Tethering module
- fix EthernetNetworkSpecifier dependency in framework-connectivity
- fix the ethernet related config resource

Bug: 210586283
Test: m
Test: atest FrameworksNetTests EthernetServiceTests
Change-Id: I54857b8517649048a343c72797668394d5225766
Merged-In: I54857b8517649048a343c72797668394d5225766
2022-03-14 14:06:35 +00:00
Xiao Ma
dbc8e0fb2b Split out the ethernet API surface and use framework-connectivity-t
Ethernet framework and service source code is going to be moved to
Connectivity mainline module, this CL contains below corresponding
changes to adapt the migration in f/b side:

1. Split out ethernet module-lib APIs to Connectivity module.
   Add the ethernet resource filegroup to tiramisu-updatable-sources
   filegroup as well, build them together. Also update the module-lib
   and system api txt to reflect the APIs change. Remove the hidden
   APIs which are moved to Connectivity module. This removal fixes the
   api inconsistent issue with Tethering/apex/hidden/.

2. Remove EthernetService from SystemServer which will be registered
   from ConnectivityServiceInitializer.

3. Replace the BackgroundThread class(imported from f/b/core/java)
   with the one in the modules-utils-backgroundthread lib, which is
   visible to Connectivity module.

Bug: 210586283
Test: m
Test: atest FrameworksNetTests EthernetServiceTests
Change-Id: I3e13cb9c0e348333af295c2537d459aa6700ff17
Merged-In: I1956848d3248cc56e9841d221e5e4c160bed65a4
2022-03-14 13:47:01 +00:00
Xiao Ma
3574a86616 Split out the ethernet API surface and use framework-connectivity-t
Ethernet framework and service source code is going to be moved to
Connectivity mainline module, this CL contains below corresponding
changes to adapt the migration in f/b side:

1. Split out ethernet module-lib APIs to Connectivity module.
   Add the ethernet resource filegroup to tiramisu-updatable-sources
   filegroup as well, build them together. Also update the module-lib
   and system api txt to reflect the APIs change. Remove the hidden
   APIs which are moved to Connectivity module. This removal fixes the
   api inconsistent issue with Tethering/apex/hidden/.

2. Remove EthernetService from SystemServer which will be registered
   from ConnectivityServiceInitializer.

3. Replace the BackgroundThread class(imported from f/b/core/java)
   with the one in the modules-utils-backgroundthread lib, which is
   visible to Connectivity module.

Bug: 210586283
Test: m
Test: atest FrameworksNetTests EthernetServiceTests
Change-Id: I3e13cb9c0e348333af295c2537d459aa6700ff17
Merged-In: I1956848d3248cc56e9841d221e5e4c160bed65a4
2022-03-14 13:47:01 +00:00
Frank Li
81110f009d Merge "[DU09-2]Modify the NetworkStatsCollection Builder API" am: 23599d75af am: 57e0845a65 am: bd3d328807
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2010324

Change-Id: If886978cb250912e38b978233210ad0ee2d6a88b
2022-03-14 03:32:29 +00:00
Frank Li
3f0e64da5a Merge "[DU09-3]Modify the NetworkStatsCollection Builder API" am: 3f5703df80 am: c36cb655e5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2010336

Change-Id: Ibcafcd8e69e4179a984ebb0fdf5a211d11407c97
2022-03-14 03:32:29 +00:00
Frank Li
c36cb655e5 Merge "[DU09-3]Modify the NetworkStatsCollection Builder API" am: 3f5703df80
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2010336

Change-Id: I70722dac5d4eb15deece4938a47b2d99fea04ec0
2022-03-14 02:59:58 +00:00
Frank Li
96189e9851 Merge "[DU09-2]Modify the NetworkStatsCollection Builder API" 2022-03-14 02:36:08 +00:00
Frank Li
23599d75af Merge "[DU09-2]Modify the NetworkStatsCollection Builder API" 2022-03-14 02:36:08 +00:00
Wei Wang
24e2cb207b API changes for resolving API council comments.
Bug:222291473
Bug:222291491
Bug:222291420
Bug:222291565

Test: atest CtsNearbyFastPairTestCases
Test: atest NearbyUnitTests
Ignore-AOSP-First: new project
CTS-Coverage-Bug: 217565373
Change-Id: I653c58216cb789df80699eef5c6e0c693f9296fc
2022-03-12 21:16:36 -08:00
TreeHugger Robot
1523bf7eb4 Merge "API changes for addressing API Council comments." into tm-dev 2022-03-11 01:51:36 +00:00
Chun Zhang
ee379fd75a Address API feedback: rename to AntispoofKey
[Antispoofkey and AntiSpoofkey should be AntispoofKey]
Bug: 218682005
Test: Unit Test
Ignore-AOSP-First: nearby_not_in_aosp_yet

Change-Id: I5124094005d446293cc6cf980a60628e93080631
2022-03-10 21:36:23 +00:00
Aaron Huang
0619e29450 Let docs tool to list the newly-visible IntDef values
Some *_ALL constants are exposed in T and they should be mentioned
in documentation. Because there are already defined InDef values
for this kind of constants. Thus, remove the list in the javadoc
and leave these up to the doc tool to list the InDef values.

Bug: 222291452
Test: m doc-comment-check-docs
Change-Id: Ibbaee5389a85bb3d696a518deea0897845553bfa
2022-03-11 01:28:59 +08:00
Aaron Huang
d695111dc9 Let docs tool to list the newly-visible IntDef values
Some *_ALL constants are exposed in T and they should be mentioned
in documentation. Because there are already defined InDef values
for this kind of constants. Thus, remove the list in the javadoc
and leave these up to the doc tool to list the InDef values.

Bug: 222291452
Test: m doc-comment-check-docs
Change-Id: Ibbaee5389a85bb3d696a518deea0897845553bfa
2022-03-11 01:28:59 +08:00
Xiao Ma
a9a3b4ce04 Split out the ethernet API surface and use framework-connectivity-t
Ethernet framework and service source code is going to be moved to
Connectivity mainline module, this CL contains below corresponding
changes to adapt the migration in f/b side:

1. Split out ethernet module-lib APIs to Connectivity module.
   Add the ethernet resource filegroup to tiramisu-updatable-sources
   filegroup as well, build them together. Also update the module-lib
   and system api txt to reflect the APIs change. Remove the hidden
   APIs which are moved to Connectivity module. This removal fixes the
   api inconsistent issue with Tethering/apex/hidden/.

2. Remove EthernetService from SystemServer which will be registered
   from ConnectivityServiceInitializer.

3. Replace the BackgroundThread class(imported from f/b/core/java)
   with the one in the modules-utils-backgroundthread lib, which is
   visible to Connectivity module.

Bug: 210586283
Test: m
Test: atest FrameworksNetTests EthernetServiceTests
Change-Id: I1956848d3248cc56e9841d221e5e4c160bed65a4
2022-03-10 21:22:42 +09:00
Xiao Ma
eaaf7d3a83 Build ethernet framework source into framework-connectivity-tiramisu
- move ethernet APIs, build it into framework-connectivity-tiramisu
- start ethernet service from ConnectivityServiceInitializer
- fix EthernetManager dependnecy in Tethering module
- fix EthernetNetworkSpecifier dependency in framework-connectivity
- fix the ethernet related config resource

Bug: 210586283
Test: m
Test: atest FrameworksNetTests EthernetServiceTests
Ignore-AOSP-First: Topic of Ethernet Mainline has merge conflict with
                   master, merge this CL first and cherry-pick it back.
Change-Id: I54857b8517649048a343c72797668394d5225766
2022-03-10 20:57:38 +09:00
Aaron Huang
5417280f17 Rename setUidForeground to noteUidForeground
Addresses API review feedback. Both setUidForeground in
NetworkStatsManager and NetworkStatsService are renamed to
noteUidForeground. Thus, the caller in test should be also
modified.

Bug: 222291301
Test: atest FrameworksNetTests
Change-Id: Ifa1e1af3d9fd8b1dc75a8f37947a5958f60ed415
2022-03-10 18:33:50 +08:00
Aaron Huang
cdc5fe2b2b Rename setUidForeground to noteUidForeground
This patch addresses API review about the naming of
NetworkStatsManager#setUidForeground and it would be
more appropriate to rename it to noteUidForeground.

Bug: 222291301
Test: atest FrameworksNetTests
Change-Id: I952762872850889609c9808aa6e3cdfc04317806
2022-03-10 18:31:21 +08:00
Aaron Huang
e6c13a7dd0 Rename setUidForeground to noteUidForeground
This patch addresses API review about the naming of
NetworkStatsManager#setUidForeground and it would be
more appropriate to rename it to noteUidForeground.

Bug: 222291301
Test: atest FrameworksNetTests
Change-Id: I952762872850889609c9808aa6e3cdfc04317806
2022-03-10 18:31:21 +08:00
Xiao Ma
6ca056520f Merge "Remove restriction that limits updateConfiguration API to Auto" am: 1bb1076d6e am: 61d27197ad am: 0884cf9c15
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2015635

Change-Id: I14f6d9bdc65623872e10fc33ce71d74db495c23b
2022-03-10 04:50:57 +00:00
Xiao Ma
2560006257 Merge "Remove restriction that limits updateConfiguration API to Auto" 2022-03-10 03:40:54 +00:00
Xiao Ma
1bb1076d6e Merge "Remove restriction that limits updateConfiguration API to Auto" 2022-03-10 03:40:54 +00:00
Xinyi Zhou
ff98750c70 Update system-current.txt and module-lib-current.txt to resolve API council comments
Bug: 216294721
Test: Compiled
Ignore-AOSP-First: nearby_not_in_aosp_yet
CTS-Coverage-Bug: 213364287
Change-Id: Ic01a517eb8d6cf4f193bf40e84cb33189f6c80d2
2022-03-10 02:41:19 +00:00
Patrick Rohr
8e718745d0 Merge "Allowing for null net caps in updateConfiguration" am: adec6f861f am: 834e5611bc am: 7ff0565c1b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2008515

Change-Id: I7ca6c1a999e5d59c72ee60d52561c3c9fa252169
2022-03-09 10:59:50 +00:00
Patrick Rohr
5ba470eded Merge "Allowing for null net caps in updateConfiguration" 2022-03-09 09:16:29 +00:00
Patrick Rohr
adec6f861f Merge "Allowing for null net caps in updateConfiguration" 2022-03-09 09:16:29 +00:00