Commit Graph

12417 Commits

Author SHA1 Message Date
Aaron Huang
2ba7d87ea7 Merge "Use the net-utils-device-common version of HexDump" am: 92e767c065 am: 600550be2f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607954

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieac67b40ce57391a614bd627ba8d3db931031760
2021-03-02 19:52:05 +00:00
Lucas Lin
24b2a334d0 Merge changes I06ab0f2d,I8b146aa1 am: 22c42d573e am: cf985cf03e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596513

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieff3c3cc14319782e264ed9b4a287b5581e6da90
2021-03-02 19:50:30 +00:00
Lucas Lin
de7ef4ab0b Merge changes I35ed84fc,Ie6cfd77b,I4e4f929f,I751526e8 am: 51d01615d3 am: 25d2ee9e66
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607733

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f6682b86e1e8d9899ea02320dd8de347e72c724
2021-03-02 19:49:13 +00:00
Aaron Huang
600550be2f Merge "Use the net-utils-device-common version of HexDump" am: 92e767c065
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607954

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1085391b5649df72b6664d5cdf1756c5110287dc
2021-03-02 19:42:02 +00:00
Lucas Lin
cf985cf03e Merge changes I06ab0f2d,I8b146aa1 am: 22c42d573e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596513

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0332bf0bf07a0a958c2e75b464d577021fd57746
2021-03-02 19:13:55 +00:00
Lucas Lin
25d2ee9e66 Merge changes I35ed84fc,Ie6cfd77b,I4e4f929f,I751526e8 am: 51d01615d3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607733

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia438f937106645eb0d6cb91772d437676bf716fd
2021-03-02 19:08:57 +00:00
Remi NGUYEN VAN
fc31f05aba Merge "Move QoS API classes to Connectivity" am: 32a606fe54 am: c02f9028be
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611876

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I774c494d6e0f136547cf9175abb6662fd106a6a3
2021-03-02 18:46:39 +00:00
Aaron Huang
92e767c065 Merge "Use the net-utils-device-common version of HexDump" 2021-03-02 06:25:34 +00:00
Lucas Lin
22c42d573e Merge changes I06ab0f2d,I8b146aa1
* changes:
  Use UserHandle#getIdentifier to get the userid
  Add test for getStartUser(), getEndUser() and createForUser()
2021-03-02 04:13:32 +00:00
Lucas Lin
51d01615d3 Merge changes I35ed84fc,Ie6cfd77b,I4e4f929f,I751526e8
* changes:
  Fix comments left on aosp/1547454 and aosp/1556106
  Remove INetworkManagementService from ConnectivityService
  Remove unused INetworkManagementService
  Remove BaseNetworkObserver from Nat464Xlat
2021-03-02 04:07:35 +00:00
lucaslin
cdda475652 Use UserHandle#getIdentifier to get the userid
UidRange uses PER_USER_RANGE to calculate and get the userid,
but PER_USER_RANGE is a hidden API, so use getIdentifier to get
the userid instead.

Bug: 170598012
Test: atest FrameworksNetTests:UidRangeTest
Change-Id: I06ab0f2da8a33d2b718bbc3a609d3d6a5fe0a095
2021-03-02 02:21:39 +00:00
Remi NGUYEN VAN
c02f9028be Merge "Move QoS API classes to Connectivity" am: 32a606fe54
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611876

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idad1f51e7f269c2cef9e836efa668a5a0afd4c5a
2021-03-02 01:28:59 +00:00
Remi NGUYEN VAN
de9477571f Move QoS API classes to Connectivity
The classes were added in S and are used to back ConnectivityManager
APIs. Add them to the connectivity boundary as they belong together with
ConnectivityManager.

Bug: 181512874
Test: m
Change-Id: I03b5978949b200a72813d1ebc4812d851fe3df37
2021-03-01 18:09:30 +09:00
Remi NGUYEN VAN
4593c2db69 Merge "Split out the connectivity API surface" am: bdf98b8928 am: af71be4b0a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552658

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iced065c53194f4c5bd54198e05ddc455a97ba50e
2021-03-01 02:25:13 +00:00
Remi NGUYEN VAN
af71be4b0a Merge "Split out the connectivity API surface" am: bdf98b8928
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552658

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e51465cfeab43ff5f154771e2e22a7cd981d066
2021-03-01 02:10:04 +00:00
Remi NGUYEN VAN
bdf98b8928 Merge "Split out the connectivity API surface" 2021-03-01 01:07:19 +00:00
Junyu Lai
1793e94183 Merge "[FUI08] Create NeworkStateSnapshot" am: dcd3962cbb am: f2f3c84c30
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536328

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a88984dbd2c8171837bd1cf2e58ed07c1d6c0d7
2021-02-26 12:43:58 +00:00
Junyu Lai
f2f3c84c30 Merge "[FUI08] Create NeworkStateSnapshot" am: dcd3962cbb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536328

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If6f0e981228ef886496f55626b499f9c487af320
2021-02-26 11:30:53 +00:00
Junyu Lai
dcd3962cbb Merge "[FUI08] Create NeworkStateSnapshot" 2021-02-26 10:53:36 +00:00
Remi NGUYEN VAN
2079e355ac Split out the connectivity API surface
Split out connectivity APIs to connectivity module directories. This
prepares future move of the connectivity code into a mainline module,
but still keeps it implemented by framework-minus-apex for now: the API
stubs are moved to framework-connectivity.stubs, but the implementation
on device remains in the same place.

This allows moving the connectivity code in/out of APEX with minimal
changes.

BYPASS_INCLUSIVE_LANGUAGE_REASON=Moving files, can't modify released API

Bug: 171540887
Test: device boots, connectivity working

Merged-In: I21c42f032efa6c10e36c749df3183ce9679303a7
(cherry-pick from internal branch with API files conflicts)

Change-Id: I21c42f032efa6c10e36c749df3183ce9679303a7
2021-02-26 19:23:25 +09:00
Aaron Huang
77eb53365b Use the net-utils-device-common version of HexDump
KeepaliveTracker is included in ConnectivityService mainline
module and it will not be able to access internal util class
com.android.internal.util.HexDump. Use the HexDump defined in
net-utils-device-common to remove dependency on internal util
class.

Bug: 177046265
Test: FrameworksNetTests
Change-Id: I1f5a6a749106b98e2baf22d6a290dcf8b51a6c36
2021-02-26 07:10:19 +00:00
Junyu Lai
a39f3727f9 Merge "Fix copyright license of VpnTransportInfo" am: 993c655bf3 am: 03a3a561b1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607313

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1172acbf1f7cb693dd06db368fe5fe70dcc11858
2021-02-26 04:35:13 +00:00
Remi NGUYEN VAN
e753cb6d5b Merge "Fix CaptivePortalDataTest on R" am: 32dbde1641 am: 24f7848d23
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605013

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib748e01e114866042996e61383151c2500fa8868
2021-02-26 04:16:35 +00:00
Remi NGUYEN VAN
e1cdb63453 Merge "Add public alternative for protectFromVpn" am: a68e748601 am: c9ba0260a3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605094

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95739021d8f70ce1d5371b21ab4357061082bf16
2021-02-26 04:16:21 +00:00
junyulai
4b836cfb98 [FUI08] Create NeworkStateSnapshot
Since NetworkState has UnsupportedAppUsage APIs that cannot
be changed, create another class for follow-up patches
to expose as system API.

Test: NetworkStateSnapshotTest
Bug: 174123988
Change-Id: I54ef872847f34166aa34a79f6178c90ac12b6c72
2021-02-26 11:57:06 +08:00
Junyu Lai
03a3a561b1 Merge "Fix copyright license of VpnTransportInfo" am: 993c655bf3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607313

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifed529b4a91bb3c52acb3d1ce708a5999a2bb595
2021-02-26 03:56:16 +00:00
Junyu Lai
993c655bf3 Merge "Fix copyright license of VpnTransportInfo" 2021-02-26 03:38:59 +00:00
Remi NGUYEN VAN
24f7848d23 Merge "Fix CaptivePortalDataTest on R" am: 32dbde1641
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605013

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifbfed272ece8e1f4c437281fc6ca46de793520fe
2021-02-26 03:25:46 +00:00
Remi NGUYEN VAN
c9ba0260a3 Merge "Add public alternative for protectFromVpn" am: a68e748601
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605094

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I759af534bdf50f647351056275857c056998bf14
2021-02-26 03:22:03 +00:00
Remi NGUYEN VAN
32dbde1641 Merge "Fix CaptivePortalDataTest on R" 2021-02-26 01:51:14 +00:00
Remi NGUYEN VAN
a68e748601 Merge "Add public alternative for protectFromVpn" 2021-02-26 01:50:32 +00:00
Chris Weir
82ba0376e5 Merge "Update tests for PANS network usage metrics" am: e6b895b488 am: df390e2e8b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1578824

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic312169c70b34bb8a834efae5ebb6b1a6cbb0296
2021-02-25 22:27:54 +00:00
Chris Weir
df390e2e8b Merge "Update tests for PANS network usage metrics" am: e6b895b488
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1578824

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ac8031b7e405226a1b055be3c80eb902d48338b
2021-02-25 21:52:40 +00:00
Chris Weir
e6b895b488 Merge "Update tests for PANS network usage metrics" 2021-02-25 21:37:42 +00:00
Paul Hu
340a4b0dc5 Merge "Use alternative PhoneStateListener formal API" am: 4de7d07302 am: 6f12370cfc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554994

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2071765aba00d8520d3715831d267bcd35795d43
2021-02-25 13:38:42 +00:00
Paul Hu
6f12370cfc Merge "Use alternative PhoneStateListener formal API" am: 4de7d07302
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554994

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I221f70b66e229c7209111227c40a0f4c0e616d85
2021-02-25 13:04:23 +00:00
Junyu Lai
d71c292044 Merge "[VCN07] Bypass VCN for non-internet app accessible cellular services" am: ef906819f9 am: b25df9f6c7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597954

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If935ced9f977749e1ce4d86fe74d186f5efcd896
2021-02-25 12:48:07 +00:00
Paul Hu
4de7d07302 Merge "Use alternative PhoneStateListener formal API" 2021-02-25 12:14:53 +00:00
Junyu Lai
b25df9f6c7 Merge "[VCN07] Bypass VCN for non-internet app accessible cellular services" am: ef906819f9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597954

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied1e0628645c1320cf306fe508820cb80d03373a
2021-02-25 11:03:33 +00:00
lucaslin
2459517a2a Add test for getStartUser(), getEndUser() and createForUser()
- Follow-up commit will modify getStartUser() and getEndUser(),
to make sure the result is consistent, add test before changing
getStartUser() and getEndUser().
- Add a test for createForUser() to ensure the last uid of
the previous user is smaller than the first uid of the next user.
- Move this test file to tests/net/common, so that it can be run
in CTS.

Bug: 170598012
Test: atest FrameworksNetTests:UidRangeTest
      CtsNetTestCasesLatestSdk:UidRangeTest
      Also run above tests on Q and R devices.
Change-Id: I8b146aa14b50911e50a39f266e8d8dc17df853b2
2021-02-25 18:32:40 +08:00
Junyu Lai
ef906819f9 Merge "[VCN07] Bypass VCN for non-internet app accessible cellular services" 2021-02-25 10:16:03 +00:00
Lucas Lin
62751fc9cd Merge "Replace BaseNetworkObserver with BaseNetdUnsolicitedEventListener" am: 692b07f7dd am: 076ce5f262
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547454

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4039814ea4c48bdaf7e54dbf3d1242a18235ee7b
2021-02-25 08:19:52 +00:00
Lucas Lin
076ce5f262 Merge "Replace BaseNetworkObserver with BaseNetdUnsolicitedEventListener" am: 692b07f7dd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547454

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd7f8fe597639f334e5d99c23ab570a751f8d9d6
2021-02-25 07:44:24 +00:00
lucaslin
e17f347585 Fix comments left on aosp/1547454 and aosp/1556106
Bug: 174837473
Test: atest FrameworksNetTests
Change-Id: I35ed84fcc53725fe29896ec37b77ef4fb4778fde
2021-02-25 15:10:29 +08:00
lucaslin
d5d3dc15ba Remove INetworkManagementService from ConnectivityService
Remove INetworkManagementService from ConnectivityService and
related files.

Bug: 174837473
Test: atest FrameworksNetTests FrameworksNetIntegrationTests
Change-Id: Ie6cfd77bbd64a8fd7539b0ea7fd15bf970e40c3d
2021-02-25 15:08:28 +08:00
lucaslin
ea5378c50f Remove unused INetworkManagementService
Bug: 174837473
Test: atest FrameworksNetTests
Change-Id: I4e4f929f518ae07bf5b4bd1e16d2a85f62ab9d9c
2021-02-25 15:08:18 +08:00
lucaslin
357f586a63 Remove BaseNetworkObserver from Nat464Xlat
Let ConnectivityService talk to Nat464Xlat through NetworkAgnetInfo
directly:
- Nat464Xlat will be created once there is a new network bringing up,
but Netd doesn't expose the method for unregistering unsolicited event.
- ConnectivityService has already registered netd unsolicited event
listener, so Nat464Xlat doesn't need to register unsolicited event
listenser by itself, it can get the unsolicited event from
ConnectivityService directly.

Bug: 174837473
Test: atest FrameworksNetTests
Change-Id: I751526e8ffa7d25591696ecd8d93b1585c4c20c7
2021-02-25 15:08:05 +08:00
Lucas Lin
692b07f7dd Merge "Replace BaseNetworkObserver with BaseNetdUnsolicitedEventListener" 2021-02-25 06:45:15 +00:00
junyulai
50f96a50bc Fix copyright license of VpnTransportInfo
Test: TH
Bug: None
Change-Id: Id1fe2c62a0fd60b9833d8b00d2fa2ddc2f031004
2021-02-25 10:31:56 +08:00
James Mattis
b98cbf8c82 Merge "Unit test automation for Multi-Default Tracking" am: 8b3ccda6bb am: 2660c17a1d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579207

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a26e63926019c37b639f59d5cd7ad901902e2b7
2021-02-24 16:54:32 +00:00