Commit Graph

2827 Commits

Author SHA1 Message Date
Treehugger Robot
447289c954 Merge "Extend timeout for receiving broadcasts" am: 15b5b58a7c am: a117895548 am: 0343d52623 am: af7065cc97
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614339

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14d649cbc5f052c2ec3b95fb9c1d3d75d285c4e5
2021-03-03 13:40:47 +00:00
Treehugger Robot
af7065cc97 Merge "Extend timeout for receiving broadcasts" am: 15b5b58a7c am: a117895548 am: 0343d52623
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614339

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ba4984427e72554c0aff2c173e72bdb93a9ea3c
2021-03-03 13:29:45 +00:00
Remi NGUYEN VAN
992369f32d Extend timeout for receiving broadcasts
The test is currently flaky as broadcasts can take a long time
to be delivered, often more than 500ms.
Extend the timeout for broadcasts to 30s.

Historically the test would wait for broadcasts for at most 500ms,
but not verify that they were received before proceeding. This was
fixed recently by adding an assertion, but the assertion needs to
give enough time for the broadcast to be received.

Bug: 173331190
Change-Id: I0760f3418c635aa4d68de5aefdb7120a9d3e930b
Test: atest FrameworksNetTests
2021-03-03 06:26:16 +00:00
Paul Hu
9e9d2ba990 Merge "Use IDnsResolverUnsolicitedEventListener" am: a476ef4d57 am: 77a35d12ac am: bf42908403 am: 3cf5e45e7e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542744

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I074243185a74c2be34ca1afda7e6d3c89c80adbe
2021-03-03 02:40:22 +00:00
Paul Hu
3cf5e45e7e Merge "Use IDnsResolverUnsolicitedEventListener" am: a476ef4d57 am: 77a35d12ac am: bf42908403
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542744

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifb6141adf3eeb096ac610e01a458d47492e68ea0
2021-03-03 02:22:31 +00:00
Paul Hu
a476ef4d57 Merge "Use IDnsResolverUnsolicitedEventListener" 2021-03-03 01:08:27 +00:00
Yan Yan
bfdbf1dbe1 Merge "Support new IpSecAlgorithm AUTH_AES_CMAC" am: 8c7f74fa35 am: d57ace3aa4 am: 2b5329cf52 am: b461146ffb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579251

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I08eaddeaaa14a6e92008b6bb9c0cbb7b13374af1
2021-03-02 21:53:02 +00:00
Yan Yan
b461146ffb Merge "Support new IpSecAlgorithm AUTH_AES_CMAC" am: 8c7f74fa35 am: d57ace3aa4 am: 2b5329cf52
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579251

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2477f98c4aeaa6059944a204cc14db5b6fb5fc63
2021-03-02 21:35:55 +00:00
Treehugger Robot
490901344e Merge "[FUI09] Expose NetworkStateSnapshot as system API" am: 4dd42cdd5f am: 8203ac16dc am: 343ddc51b9 am: 4ed07ba929
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536708

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2b258340c950aac65ad8a01bb34746766a13529f
2021-03-02 21:32:06 +00:00
Treehugger Robot
cc9ae5868e Merge "[FUI17] Migrate NetworkStatsService to use NetworkStateSnapshot" am: 60faefffe9 am: 0e300026f9 am: 5f95c2d8a9 am: e234a8abe7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556553

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9fb86c8d7bd56a439e48f75a216a27dfec64bdb6
2021-03-02 21:31:53 +00:00
Treehugger Robot
4ed07ba929 Merge "[FUI09] Expose NetworkStateSnapshot as system API" am: 4dd42cdd5f am: 8203ac16dc am: 343ddc51b9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536708

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41be29daeba58378ab374c346684a3d205f0d7c9
2021-03-02 21:10:48 +00:00
Treehugger Robot
e234a8abe7 Merge "[FUI17] Migrate NetworkStatsService to use NetworkStateSnapshot" am: 60faefffe9 am: 0e300026f9 am: 5f95c2d8a9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556553

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2207873ffb549f26026e33f14440be494e4b4175
2021-03-02 21:10:19 +00:00
Lucas Lin
2bb70d2c0d Merge changes I06ab0f2d,I8b146aa1 am: 67ba0bc206 am: c4432db9e9 am: 5a00e3af70 am: c966de4129
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596513

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4fa2aa5703fb592e10edb9b835477e56dadd0950
2021-03-02 20:10:22 +00:00
Lucas Lin
c030494259 Merge changes I35ed84fc,Ie6cfd77b,I4e4f929f,I751526e8 am: 51510ea705 am: 0fef75ee53 am: e5d40c1933 am: 9cf690d187
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607733

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id695a3eb056970ddddf9fbe78afab0155fafac08
2021-03-02 20:10:13 +00:00
Lucas Lin
c966de4129 Merge changes I06ab0f2d,I8b146aa1 am: 67ba0bc206 am: c4432db9e9 am: 5a00e3af70
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596513

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I75c940363940f4c941cc7dc89452bed078396a7e
2021-03-02 19:55:02 +00:00
Lucas Lin
9cf690d187 Merge changes I35ed84fc,Ie6cfd77b,I4e4f929f,I751526e8 am: 51510ea705 am: 0fef75ee53 am: e5d40c1933
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607733

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I54ef9fd59388908f38721671dd26f536fab719bb
2021-03-02 19:54:22 +00:00
Yan Yan
8c7f74fa35 Merge "Support new IpSecAlgorithm AUTH_AES_CMAC" 2021-03-02 18:24:27 +00:00
junyulai
604fd08ca8 [FUI09] Expose NetworkStateSnapshot as system API
This is needed by NetworkStatsService and
NetworkPolicyManagerService to utilize the snapshots of
information of networks that grabbed from ConnectivityService.

Test: atest FrameworksNetTests NetworkPolicyManagerServiceTest
Bug: 174123988
Change-Id: I7e974ef7b23ba9ba6ee775eed9899b0c0e2eca55
2021-03-02 23:09:16 +08:00
junyulai
6b70436047 [FUI17] Migrate NetworkStatsService to use NetworkStateSnapshot
This change migrates NetworkStatsService and related code to use
NetworkStateSnapshot which is used for replacing the NetworkState.

This patch also changes some formating which is suggested by
the linter.

Test: FrameworksNetTests NetworkPolicyManagerServiceTest
Bug: 174123988
Change-Id: I547da8f411cb45bdadc376ac3cadf3f3c55bb282
2021-03-02 20:08:53 +08:00
Lucas Lin
67ba0bc206 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
51510ea705 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
paulhu
35ed7c5a90 Use IDnsResolverUnsolicitedEventListener
Only part of events will report from DnsResolver through
INetdEventListener. So use IDnsResolverUnsolicitedEventListener
to get exactly supporting events from DnsResolver and it uses
Parcelable object to deliver data which can be more updateable
and extendable in the future.

Bug: 173485754
Test: atest FrameworksNetTests
      atest CtsNetTestCases
Change-Id: I8d2e700ae8861ed8ceccd287f3ca5bc2f1ed6dee
2021-03-02 11:37:47 +08:00
Junyu Lai
51b7e07430 Merge "Fix copyright license of VpnTransportInfo" am: 594e8def4c am: 9044d1e472 am: bc88904010 am: 69b8cbd32e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607313

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iacba217b5e88b1cca161bf74679091138ce6a9fc
2021-03-01 08:14:23 +00:00
Chris Weir
f0a8713a0c Merge "Update tests for PANS network usage metrics" am: b1cba34bfd am: 3d6031160f am: d7b355bf4c am: 86591e9bbe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1578824

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I49fc400c2fd4701b0814356d25c0b2f5946db92c
2021-03-01 08:12:19 +00:00
Junyu Lai
69b8cbd32e Merge "Fix copyright license of VpnTransportInfo" am: 594e8def4c am: 9044d1e472 am: bc88904010
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607313

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf6ba342dfbc92fc4852b96d1c3f3b3f34cc3322
2021-03-01 08:07:27 +00:00
Chris Weir
86591e9bbe Merge "Update tests for PANS network usage metrics" am: b1cba34bfd am: 3d6031160f am: d7b355bf4c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1578824

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I212c317f744d88bc97b34195e4f86f447fb7bd52
2021-03-01 08:00:07 +00:00
Shuo Qian
8b8f2625db Merge changes from topic "cp-rvc-aosp" into sc-dev
* changes:
  [automerged blank] Add Emergency callback mode shell command 2p: b201f9b1e6
  Add Emergency callback mode shell command
2021-02-26 22:56:18 +00:00
Paul Hu
1923ece64c Merge "Use alternative PhoneStateListener formal API" am: 45f58ae930 am: b0faafbcbc am: 5611936630
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554994

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib176dcbf9d2d60f3f7393e50d765f296a83b77ce
2021-02-26 17:25:40 +00:00
Junyu Lai
5b4c4fea18 Merge "[VCN07] Bypass VCN for non-internet app accessible cellular services" am: 4cfe6d8f57 am: 711ce9c728 am: 54319cbd0a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597954

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iade334bfade0457afc6ab2806e481a5e0c85616c
2021-02-26 17:25:16 +00:00
James Mattis
5e9d75930f Merge "Unit test automation for Multi-Default Tracking" am: 8b3ccda6bb am: 142f7c3e80 am: d77e30fade
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579207

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ddb565af1106f10186c83debd6d20be850d4198
2021-02-26 13:05:37 +00:00
Junyu Lai
594e8def4c Merge "Fix copyright license of VpnTransportInfo" 2021-02-26 03:38:59 +00:00
Chris Weir
b1cba34bfd Merge "Update tests for PANS network usage metrics" 2021-02-25 21:37:42 +00:00
Yan Yan
bd0b8751e6 Support new IpSecAlgorithm AUTH_AES_CMAC
Bug: 161716062
Test: IpSecAlgorithmTest, verified with CTS
Change-Id: Ideaf4225bd851fad8c8072505c6ad99d85ba616e
2021-02-25 10:35:10 -08:00
Paul Hu
45f58ae930 Merge "Use alternative PhoneStateListener formal API" 2021-02-25 12:14:53 +00:00
lucaslin
993577449a 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
4cfe6d8f57 Merge "[VCN07] Bypass VCN for non-internet app accessible cellular services" 2021-02-25 10:16:03 +00:00
lucaslin
7abe207795 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
1f110f6760 Remove unused INetworkManagementService
Bug: 174837473
Test: atest FrameworksNetTests
Change-Id: I4e4f929f518ae07bf5b4bd1e16d2a85f62ab9d9c
2021-02-25 15:08:18 +08:00
lucaslin
b5b65cf458 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
junyulai
e8e3dda62f Fix copyright license of VpnTransportInfo
Test: TH
Bug: None
Change-Id: Id1fe2c62a0fd60b9833d8b00d2fa2ddc2f031004
2021-02-25 10:31:56 +08:00
Sarah Chin
02be60c442 Merge "APIs for 5G slicing" into sc-dev 2021-02-24 17:36:45 +00:00
Chris Weir
7a02d32a6c Update tests for PANS network usage metrics
Update existing tests to use new NetworkTemplate/NetworkIdentity
constructors, and add additional tests for new PANS metrics features.

Bug: 175793874
Bug: 174485293
Test: Run the tests in this CL with atest

Change-Id: I6f50993397d886a266874da0047c02022a69f62e
2021-02-23 22:16:19 -08:00
James Mattis
0b82004d34 Unit test automation for Multi-Default Tracking
Unit test automation validating how multiple default networks are
tracked within ConnectivityService when set by network preferences
used with setOemNetworkPreference() API functionality.

Bug: 178632672
Bug: 172347841
Bug: 170068946
Test: atest FrameworksNetTests
Change-Id: Iae1935944214efaa8a21636c55e6d8be816275f7
2021-02-23 19:03:34 -08:00
Chiachang Wang
89d6183cdf Merge "Remove UidRange.createForUser() with userId integers" am: 9c92c37f56 am: 5809c1f054 am: 58becf95ef
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596511

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a3c072f7b82e51b5fb71f8c591680cfc1d0041b
2021-02-24 02:14:37 +00:00
Lucas Lin
5c05ff4fce Merge changes I852e3a53,I86755647,I0ed8b0c6 am: 654b0fff63 am: d319fef084 am: 07d4708ab7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553736

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I032e3d8f16b164f067dba02bde950b93f4e54b83
2021-02-23 22:56:46 +00:00
Paul Hu
83b9264bad Merge "Stop using SysetmConfig#getSystemPermissions on PermissionMonitor" am: 19af44e2ce am: bdc150f744 am: f4d45a9d21
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545848

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7902f041b29dbf4cf2a05bf4885f0e4fa2af0528
2021-02-23 22:55:02 +00:00
Chiachang Wang
9c92c37f56 Merge "Remove UidRange.createForUser() with userId integers" 2021-02-23 07:17:07 +00:00
Sarah Chin
3543f3c2fb APIs for 5G slicing
Create TrafficDescriptor class
Create new APN ENTERPRISE
Update setupDataCall and DataCallResponse to take TrafficDescriptor and
matchAllRuleAllowed
Move ApnTypes from Annotation to ApnSetting

Bug: 179312227
Test: atest FrameworksTelephonyTests
Change-Id: I7433976bfe25bcb2af85ffb9338959cbcc9f42f3
2021-02-22 21:58:07 -08:00
Chiachang Wang
66ded137bf Remove UidRange.createForUser() with userId integers
UidRange will be a part of connectivity mainline module.
Mainline modules should use strongly-typed UserHandle arguments.
The method also refer to the hidden UserHandle.PER_USER_RANGE
which is not available after UidRange is moved into module.
Thus, replace the usage and remove the createForUser method that
takes userId parameter.

Bug: 170598012
Test: atest FrameworksNetTests
Change-Id: I3f33ea92c4a24342af9ec4b0367c50bb64ce6450
2021-02-22 18:51:14 +08:00
Lucas Lin
654b0fff63 Merge changes I852e3a53,I86755647,I0ed8b0c6
* changes:
  Remove unused INetworkManagementService from IpSecService
  Use NetdUtils instead of NetworkManagementService in Vpn
  Use NetdUtils instead of NetworkManagementService in IpSecService
2021-02-22 06:49:39 +00:00