Commit graph android_packages_modules_Co.../tests/net/java/com
Message SHA1
Merge "Applying OEM network pref to all users" am: 3f0925ee2e am: 00f75b0b32 am: 68fad37f38
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612760

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9988f9ecac19976dd78dbcf9a749adba5daa578c

James Mattis   authored and   Automerger Merge Worker   commited 2021-03-05 22:37:45 +00:00
c090ae6387
Merge "Applying OEM network pref to all users"
James Mattis   authored and   Gerrit Code Review   commited 2021-03-05 19:09:24 +00:00
3f0925ee2e
Merge "[FUI22] Support getAllNetworkStateSnapshot" am: bcbc04f329 am: f216522f0f am: 54c1b0624f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614779

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52f8339bd1cda35a3f26f28fd3c0165f6f6ff91e

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-03-05 07:10:46 +00:00
52ccd5b9dd
Merge "[FUI22] Support getAllNetworkStateSnapshot"
Treehugger Robot   authored and   Gerrit Code Review   commited 2021-03-05 05:16:43 +00:00
bcbc04f329
Merge "Keystore 2.0: Make VPN Keystore 2.0 ready."
Janis Danisevskis   authored and   Gerrit Code Review   commited 2021-03-05 02:57:34 +00:00
c410b053b9
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
Merged-In: Iae1935944214efaa8a21636c55e6d8be816275f7

James Mattis   commited 2021-03-04 13:13:48 -08:00
b4c62b8862
Applying OEM network pref to all users
Updating handleSetOemNetworkPreference so that the given policy is
applied to all users on the device. Additionally, remove uids for all
users/apps so that stale uids don't stay present after rematch. Finally,
small cleanup on how we deal with remote exceptions.

Bug: 181581017
Bug: 176494815
Test: atest FrameworksNetTests
atest NetworkStackTests
atest FrameworksNetIntegrationTests
atest NetworkStackIntegrationTests
atest CtsNetTestCasesLatestSdk

Change-Id: I214717ee0c78cfe8322e551c2c2e9dc01c0242b2

James Mattis   commited 2021-03-04 11:32:10 -08:00
3bf8b7a1b9
Merge changes Ie8d98359,I4d5cadfd am: 63383e755e am: 044ef2ba4e am: 010f29032c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612254

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7700b4ed9dd9105beb947944d63138330d8c565e

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-03-04 14:51:09 +00:00
d86b902b36
Merge changes Ie8d98359,I4d5cadfd
* changes:
  Fix a bug in RequestReassignment#toString
  Cleanup some of the PANS code

Treehugger Robot   authored and   Gerrit Code Review   commited 2021-03-04 12:39:04 +00:00
63383e755e
[FUI22] Support getAllNetworkStateSnapshot
Currently, ConnectivityService has getAllNetworkState but it is
not ideal to expose as system API since the plan is to get rid
of NetworkState. Thus, create a new one that returns
NetworkStateSnapshot to fulfill the needs.

Note the original getAllNetworkState cannot be deleted now since
it has @UnsupportedAppUsage annotation.

Test: atest FrameworksNetTests
Bug: 174123988
Change-Id: Icddd434552b0e9ecbc8299e7242ec88cf3145aca

junyulai   commited 2021-03-04 18:41:09 +08:00
5784080f24
Keystore 2.0: Make VPN Keystore 2.0 ready.
* Use public stable API to load certificates from keystore.
* Also use grants to allow racoon to use keystore keys without
  special exceptions in keystore.
* Use LegacyProfileStore instead of Keystore for storing VPN profiles.

Bug: 175068876
Bug: 171305607
Test: atest android.net.cts.Ikev2VpnTest
      atest android.net.cts.IpSecManagerTest
      atest com.android.server.connectivity.VpnTest
      atest com.android.server.ConnectivityServiceTest
Merged-In: I27975113896ea137260a9f94a34fb1c3ca173fe3
Change-Id: I27975113896ea137260a9f94a34fb1c3ca173fe3

Janis Danisevskis   commited 2021-03-03 22:14:41 -08:00
535b7b557c
Merge "[FUI19] Migrate ConnectivityService to use NetworkStatsManager" am: f9d8415ef7 am: e301afdcfd am: 5a99734509
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560408

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I48c92ae353490c05f1704b010b3c6f25505164c3

Junyu Lai   authored and   Automerger Merge Worker   commited 2021-03-04 05:06:53 +00:00
9872e34c5c
Merge "[FUI19] Migrate ConnectivityService to use NetworkStatsManager"
Junyu Lai   authored and   Gerrit Code Review   commited 2021-03-04 01:24:57 +00:00
f9d8415ef7
Merge "Keystore 2.0: Make VPN Keystore 2.0 ready." into sc-dev
Janis Danisevskis   authored and   Android (Google) Code Review   commited 2021-03-03 22:28:41 +00:00
0325b14121
Merge "APIs for 5G slicing"
Sarah Chin   authored and   Gerrit Code Review   commited 2021-03-03 18:42:20 +00:00
564ab64fab
Merge "Extend timeout for receiving broadcasts" am: 08ef7ddaff am: 04707731d3 am: 132b0dcbad
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614339

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ba4984427e72554c0aff2c173e72bdb93a9ea3c

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-03-03 13:29:45 +00:00
333bb77a5f
[FUI19] Migrate ConnectivityService to use NetworkStatsManager
Test: atest FrameworksNetTests
Bug: 174123988
Change-Id: Iaefd99f87ae96bc9d97d139bcd92a3fe8de917d2

junyulai   commited 2021-03-03 20:01:51 +08:00
c9a235aadc
Keystore 2.0: Make VPN Keystore 2.0 ready.
* Use public stable API to load certificates from keystore.
* Also use grants to allow racoon to use keystore keys without
  special exceptions in keystore.
* Use LegacyProfileStore instead of Keystore for storing VPN profiles.

Bug: 175068876
Bug: 171305607
Test: atest android.net.cts.Ikev2VpnTest
      atest android.net.cts.IpSecManagerTest
      atest com.android.server.connectivity.VpnTest
      atest com.android.server.ConnectivityServiceTest
Change-Id: I27975113896ea137260a9f94a34fb1c3ca173fe3

Janis Danisevskis   commited 2021-03-02 22:56:44 -08:00
42f77b882f
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

Remi NGUYEN VAN   commited 2021-03-03 06:26:16 +00:00
27ed37105b
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
Merged-In: I7433976bfe25bcb2af85ffb9338959cbcc9f42f3

Sarah Chin   authored and   Chalard Jean   commited 2021-03-03 14:16:21 +09:00
ce85c4c118
Cleanup some of the PANS code
Test: FrameworksNetTests
Change-Id: I4d5cadfdd8e30a179948302e8c0c45f4d42b59ea

Chalard Jean   commited 2021-03-03 14:16:21 +09:00
dc97407cfc
Merge "Use IDnsResolverUnsolicitedEventListener" am: 3503759a6f am: 3506a1b335 am: cf2e3208f2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542744

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifb6141adf3eeb096ac610e01a458d47492e68ea0

Paul Hu   authored and   Automerger Merge Worker   commited 2021-03-03 02:22:31 +00:00
e7c56922dc
Merge "Use IDnsResolverUnsolicitedEventListener"
Paul Hu   authored and   Gerrit Code Review   commited 2021-03-03 01:08:27 +00:00
3503759a6f
Merge "[FUI09] Expose NetworkStateSnapshot as system API" am: 7a593e640d am: d73af919b6 am: 2fd6d378c8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536708

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41be29daeba58378ab374c346684a3d205f0d7c9

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-03-02 21:10:48 +00:00
62162a5b32
Merge "[FUI17] Migrate NetworkStatsService to use NetworkStateSnapshot" am: ebfdaa502f am: 15c7e774c2 am: c92d0ab048
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556553

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2207873ffb549f26026e33f14440be494e4b4175

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-03-02 21:10:19 +00:00
49e0aa90b2
Merge changes I35ed84fc,Ie6cfd77b,I4e4f929f,I751526e8 am: 51d01615d3 am: 25d2ee9e66 am: de7ef4ab0b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607733

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I54ef9fd59388908f38721671dd26f536fab719bb

Lucas Lin   authored and   Automerger Merge Worker   commited 2021-03-02 19:54:22 +00:00
2d939b27d4
[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

junyulai   commited 2021-03-02 23:09:16 +08:00
c6e8355dbd
[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

junyulai   commited 2021-03-02 20:08:53 +08:00
527859f7a4
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

Lucas Lin   authored and   Gerrit Code Review   commited 2021-03-02 04:07:35 +00:00
51d01615d3
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

paulhu   commited 2021-03-02 11:37:47 +08:00
0a2aa80965
Merge "Update tests for PANS network usage metrics" am: e6b895b488 am: df390e2e8b am: 82ba0376e5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1578824

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I212c317f744d88bc97b34195e4f86f447fb7bd52

Chris Weir   authored and   Automerger Merge Worker   commited 2021-03-01 08:00:07 +00:00
a898ed9dac
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

Shuo Qian   authored and   Android (Google) Code Review   commited 2021-02-26 22:56:18 +00:00
34c3c1c32a
Merge "[VCN07] Bypass VCN for non-internet app accessible cellular services" am: ef906819f9 am: b25df9f6c7 am: d71c292044
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597954

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iade334bfade0457afc6ab2806e481a5e0c85616c

Junyu Lai   authored and   Automerger Merge Worker   commited 2021-02-26 17:25:16 +00:00
d4ec0e4160
Merge "Unit test automation for Multi-Default Tracking" am: 8b3ccda6bb am: 2660c17a1d am: b98cbf8c82
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579207

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ddb565af1106f10186c83debd6d20be850d4198

James Mattis   authored and   Automerger Merge Worker   commited 2021-02-26 13:05:37 +00:00
140398ea37
Merge "Update tests for PANS network usage metrics"
Chris Weir   authored and   Gerrit Code Review   commited 2021-02-25 21:37:42 +00:00
e6b895b488
Merge "[VCN07] Bypass VCN for non-internet app accessible cellular services"
Junyu Lai   authored and   Gerrit Code Review   commited 2021-02-25 10:16:03 +00:00
ef906819f9
Remove INetworkManagementService from ConnectivityService
Remove INetworkManagementService from ConnectivityService and
related files.

Bug: 174837473
Test: atest FrameworksNetTests FrameworksNetIntegrationTests
Change-Id: Ie6cfd77bbd64a8fd7539b0ea7fd15bf970e40c3d

lucaslin   commited 2021-02-25 15:08:28 +08:00
d5d3dc15ba
Remove unused INetworkManagementService
Bug: 174837473
Test: atest FrameworksNetTests
Change-Id: I4e4f929f518ae07bf5b4bd1e16d2a85f62ab9d9c

lucaslin   commited 2021-02-25 15:08:18 +08:00
ea5378c50f
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

lucaslin   commited 2021-02-25 15:08:05 +08:00
357f586a63
Merge "APIs for 5G slicing" into sc-dev
Sarah Chin   authored and   Android (Google) Code Review   commited 2021-02-24 17:36:45 +00:00
414f1fd265
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

Chris Weir   commited 2021-02-23 22:16:19 -08:00
b692cc8e5c
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

James Mattis   commited 2021-02-23 19:03:34 -08:00
6177885a1a
Merge "Remove UidRange.createForUser() with userId integers" am: a611e12599 am: 06efdc49f3 am: d1e6da0852
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596511

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a3c072f7b82e51b5fb71f8c591680cfc1d0041b

Chiachang Wang   authored and   Automerger Merge Worker   commited 2021-02-24 02:14:37 +00:00
5feeaa8673
Merge changes I852e3a53,I86755647,I0ed8b0c6 am: 0f35b07653 am: 9af180ede6 am: 58f8da548d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553736

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I032e3d8f16b164f067dba02bde950b93f4e54b83

Lucas Lin   authored and   Automerger Merge Worker   commited 2021-02-23 22:56:46 +00:00
3a9e7f3713
Merge "Stop using SysetmConfig#getSystemPermissions on PermissionMonitor" am: 3172402dff am: 29c0ce536f am: e137456173
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545848

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7902f041b29dbf4cf2a05bf4885f0e4fa2af0528

Paul Hu   authored and   Automerger Merge Worker   commited 2021-02-23 22:55:02 +00:00
01984b0c8d
Merge "Remove UidRange.createForUser() with userId integers"
Chiachang Wang   authored and   Gerrit Code Review   commited 2021-02-23 07:17:07 +00:00
a611e12599
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

Sarah Chin   commited 2021-02-22 21:58:07 -08:00
a5e4fc1359
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

Chiachang Wang   commited 2021-02-22 18:51:14 +08:00
c94d3238a3
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

Lucas Lin   authored and   Gerrit Code Review   commited 2021-02-22 06:49:39 +00:00
0f35b07653
Merge "Stop using SysetmConfig#getSystemPermissions on PermissionMonitor"
Paul Hu   authored and   Gerrit Code Review   commited 2021-02-22 05:22:37 +00:00
3172402dff