summaryrefslogtreecommitdiff
path: root/tests/net/java/com/android
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Create ServiceConnectivityResourcesRemi NGUYEN VAN2021-03-121-11/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create the ServiceConnectivityResources package, which contains resources Connectivity unbundled from platform resources. Migrate the first few resources from ConnectivityService that have no RRO in AOSP. To avoid boot time impact, avoid loading the resources in the ConnectivityService constructor. Bug: 182125649 Test: atest FrameworksNetTests Merged-In: I77ac6f4303c54acc96f16e18ef02add30298ff3d Change-Id: I77ac6f4303c54acc96f16e18ef02add30298ff3d
* | | Change the parameter type from ContentResolver to Contextlucaslin2021-03-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Context is more useful than ContentResolver, it can provide more information if we want to change the behavior in the future. Bug: 172183305 Test: atest FrameworksNetTests Change-Id: I5702c7d74b862a76558b94f1abe2c6df9eb7f097
* | | Merge "ConnectivityManager: Provide API's to include location sensitive ↵Roshan Pius2021-03-121-45/+129
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | info" am: a982725793 am: 890fdb016e am: 0659f32f4d Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595396 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icf60935623b62e29cb2ba52b4de554c7f0d78ef1
| * | Merge "ConnectivityManager: Provide API's to include location sensitive info"Roshan Pius2021-03-121-45/+129
| |\ \
| | * | ConnectivityManager: Provide API's to include location sensitive infoRoshan Pius2021-03-111-45/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Existing NetworkCallback users will get NetworkCapabilities with location sensitive data removed (except for ownerUid which will be added for existing apps for backwards compatibility). Apps have to opt-in to receive location sensitive data. Note: This was chosen because WifiInfo is the only TransportInfo tha has location sensitive info & that was added only in Android 12. If we choose to default to true, all existings apps retrieving NetworkCapabilities for wifi networks will be blamed for location access unnecessarily. Changes: i) Add a flag in NetworkCallback creation to retrieve NetworkCapabilities with location sensitive info in their callback. (More flags are being planned for NetworkCallback for throttling callback frequency, etc) ii) For NetworkCapabilities.getOwnerUid(), we will continue to send the data for apps targeting older SDK (since this is an existing field and the new flag defaults location sensitive data to off). Bug: 156867433 Test: atest android.net Test: atest com.android.server Change-Id: If70b5ea6f5c8885f0c353c8df08a826d55fe7f7a
* | | | Merge "Stop using PackageManagerInternal in PermissionMonitor" am: ↵Paul Hu2021-03-121-10/+38
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4f0e7df6e3 am: 3bd9d6993b am: c065b05794 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620879 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icc75ae78a6a09fac22cd2ae9ddc04138c4ba02d3
| * | | Merge "Stop using PackageManagerInternal in PermissionMonitor"Paul Hu2021-03-121-10/+38
| |\ \ \
| | * | | Stop using PackageManagerInternal in PermissionMonitorpaulhu2021-03-111-10/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Replace the PackageManagerInternal#getPackageList() with receiving PACKAGE_{ADDED|REMOVED} intent. - Also remove the onPackageChanged method because the traffaic permissions(INTERNET, UPDATE_DEVICE_STATS) are not changed after package changed(Disable or enable package). Bug: 176788468 Test: atest FrameworksNetTests Change-Id: I5505d1c77db66a7e65fc336ea0e99846e78c6b36
* | | | | Merge changes Ib80f814f,Ic605e489 am: ae7491e2f9 am: 46bafc65ab am: 7b190776baLucas Lin2021-03-121-4/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626209 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I47862eeec4f74a0901b8b866dd6ffa906bd9e62f
| * | | | Merge changes Ib80f814f,Ic605e489Lucas Lin2021-03-121-4/+6
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | * changes: Use new API - getIpSecNetIdRange() in IpSecService Add a new API to get the network ID range of IPSec tunnel interface
| | * | | Add a new API to get the network ID range of IPSec tunnel interfacelucaslin2021-03-121-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add a new API to get the network ID range of IPSec tunnel interface. - Use the new API in IpSecServiceTest to make sure the result is the same. Follow-up commit will change the logic in IpSecService#reserveNetId(), the modified test can ensure the correctness of the new change. Bug: 172183305 Test: atest FrameworksNetTests:IpSecServiceTest Change-Id: Ic605e48941fc9d6482cdcd01a8adcdc9b6d586a6
| * | | | Merge changes from topic "ethernet_specifier"Remi NGUYEN VAN2021-03-111-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Fix common tests on Q and R Add Ethernet, TestNetworkSpecifier API
| | * | | | Add Ethernet, TestNetworkSpecifier APIRemi NGUYEN VAN2021-03-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename StringNetworkSpecifier to EthernetNetworkSpecifier (its only production user), and make it module-lib API. The original StringNetworkSpecifier file is actually kept to satisfy some invalid dependencies; it will be removed separately. This allows specifying an Ethernet interface with a non-deprecated API: until this change the only way to do so would be to use NetworkRequest#setSpecifier(String), which is deprecated. Similarly, add the TestNetworkSpecifier API for TestNetworkManager, to replace previous usage of StringNetworkSpecifier. TestNetworkManager is module API, so TestNetworkSpecifier should be module API too. This allows tests to request the test interface specifically, without using the deprecated NetworkRequest#setSpecifier(String). Bug: 179329291 Test: m Merged-In: Iee569f5c8bbdc4bc979610e1191308281f3d4620 Change-Id: Iee569f5c8bbdc4bc979610e1191308281f3d4620
* | | | | | Merge "Create ServiceConnectivityResources" into sc-devRemi NGUYEN VAN2021-03-121-11/+18
|\ \ \ \ \ \
| * | | | | | Create ServiceConnectivityResourcesRemi NGUYEN VAN2021-03-091-11/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create the ServiceConnectivityResources package, which contains resources Connectivity unbundled from platform resources. Migrate the first few resources from ConnectivityService that have no RRO in AOSP. To avoid boot time impact, avoid loading the resources in the ConnectivityService constructor. Bug: 182125649 Test: atest FrameworksNetTests Change-Id: I77ac6f4303c54acc96f16e18ef02add30298ff3d
* | | | | | | Merge changes Iac9487e8,Ifa411c7b am: 999506022f am: 7d70dd9c33 am: bec7ce5cf4Treehugger Robot2021-03-121-2/+11
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622675 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If1b3f0447705f910467a52d2504ba1aaef850a80
| * | | | | | [VCN11] Make requestBackgroundNetwork requires handlerjunyulai2021-03-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: atest FrameworksNetTests android.net.cts.ConnectivityManagerTest Bug: 175662146 Change-Id: Iac9487e8de8bfdd87fc7a0153b228ae2a7ba4e19
| * | | | | | [VCN10] Add new API to listen for highest score networkjunyulai2021-03-111-1/+9
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: atest ConnectivityServiceTest#testRegisterBestMatchingNetworkCallback Bug: 175662146 Change-Id: Ifa411c7b53da789c74fff7e1a95f9c9ebf5bd05c
* | | | | | Merge "Don't start clatd if disabled by vendor property." am: a517079da0 am: ↵Lorenzo Colitti2021-03-113-13/+112
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c147019ab2 am: 67b99e7bee Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625702 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6989361f1dae72cb94d6e6cf6144ae61cb80c328
| * | | | | Merge "Don't start clatd if disabled by vendor property."Lorenzo Colitti2021-03-113-13/+112
| |\ \ \ \ \
| | * | | | | Don't start clatd if disabled by vendor property.Lorenzo Colitti2021-03-113-13/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: 182333299 Test: new unit tests Change-Id: Ic15dc4fff6a13aa916e3d2dc6203829e96ddeda4
* | | | | | | Merge "Unbreak extraInfo values returned to apps." am: 78cf2f60e5 am: ↵Lorenzo Colitti2021-03-111-4/+66
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4fe7f5bf8b am: f7bc7a0532 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624040 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5e50ac962959387ec42ee644376e1c10df0dc677
| * | | | | | Merge "Unbreak extraInfo values returned to apps."Lorenzo Colitti2021-03-111-4/+66
| |\| | | | |
| | * | | | | Unbreak extraInfo values returned to apps.Lorenzo Colitti2021-03-111-4/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were broken by aosp/1553463, which made filterNetworkInfo unconditionally call setDetailedState with a reason of "" and an extraInfo of null. Fix both synchronous getter APIs (e.g., getNetworkInfo) and CONNECTIVITY_ACTION broadcasts by calling a new filterForLegacyLockdown method that behaves similarly to how the now-deleted LockdownVpnTracker#augmentNetworkInfo used to behave. While I'm at it, move back to private a method that was public only because LockdownVpnTracker used it. Fix: 181855958 Test: new unit test coverage Change-Id: I2c7b88fcec9dd36b45cb51db8d19b3ee8bad44a6
* | | | | | | Merge "Set extraInfo on cellular TestNetworkAgents." am: f0f69b46e2 am: ↵Lorenzo Colitti2021-03-111-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 55c89d19f8 am: bfd6610a59 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624039 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I41e016fa2cf4907905e3c4f9ab4dbc3d7c0ad418
| * | | | | | Merge "Set extraInfo on cellular TestNetworkAgents."Lorenzo Colitti2021-03-111-3/+3
| |\| | | | |
| | * | | | | Set extraInfo on cellular TestNetworkAgents.Lorenzo Colitti2021-03-101-3/+3
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the test more realistic, since telephony always puts the APN name in the extraInfo field. It also makes it easy to test that various APIs properly return the extra info without plumbing a new parameter through TestNetworkAgentWrapper, NetworkAgentWrapper, and InstrumentedNetworkAgent. Also make the extraInfo and the legacyType available to tests. This will be used in future tests that assert the contents of extraInfo. Bug: 181855958 Test: test-only change Change-Id: If4eddb6cd9e70bb33e10d72aceebaea843244246
* | | | | | Merge "Remove IBatteryStats from ConnectivityService module" am: a06c417b0f ↵Aaron Huang2021-03-111-6/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7ed2eb0997 am: fe4b159779 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623262 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I58a89eee64c57fbf04e21ee0996eff435584f709
| * | | | | Merge "Remove IBatteryStats from ConnectivityService module"Aaron Huang2021-03-111-6/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Remove IBatteryStats from ConnectivityService moduleAaron Huang2021-03-091-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently ConnectivityService calls the methods in BatteryStatsService through BatteryStatsManager so IBatteryStats can be removed from ConnectivityService. Bug: 171686421 Test: FrameworksNetTests Change-Id: I559369c9900e8100cdae187bc9cec603ed85a131
* | | | | | Merge "Fix a bug where listen callbacks would not be called" am: d36130f759 ↵Chalard Jean2021-03-101-5/+27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2d51f15105 am: 0a07cc6615 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620900 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I216167c2809ddc12e4a92faedf3bb4dc5c1a56cb
| * | | | | Merge "Fix a bug where listen callbacks would not be called"Chalard Jean2021-03-101-5/+27
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix a bug where listen callbacks would not be calledChalard Jean2021-03-091-5/+27
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NetworkAgentInfos cache the list of requests they satisfy, and that list is used to send callbacks. Therefore, when the TRACK_DEFAULTs are copied, this list needs to be updated. The best way to do this is to figure out what was the old active request and find which requests corresponds to it in the new list, and then upon registering adding the active request to the relevant satisfier if present. A few other ways can be considered like replacing the request as it gets added, but this would temporarily increase the number of callbacks allocated to the app and risks crashing it for no good reason ; furthermore the call to remove would have to be eschewed somehow for those requests that are replaced. This is much simpler. Test: new test for this. This also passes the future tests for per-profile default network preference. Change-Id: I001351e5c478c2c77cbf2844abca77b205291778
| * | | | Merge changes I1d1f0d2d,Ifbd4a978Aaron Huang2021-03-091-8/+13
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | * changes: Communicate with BatteryStatsService through BatteryStatsManager Add a new API in BatteryStatsManager for connectivity service
| | * | | Communicate with BatteryStatsService through BatteryStatsManagerAaron Huang2021-03-091-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mainline connectivity service is only allowed to use formal APIs. Use new system API in BatteryStatsManager instead of calling BatteryStatsService directly. Bug: 171686421 Test: FrameworksNetTests Change-Id: I1d1f0d2d456003e842ad77519667c0532995610d Merged-In: I1d1f0d2d456003e842ad77519667c0532995610d
* | | | | Merge "Add Ethernet, TestNetworkSpecifier API" into sc-devRemi NGUYEN VAN2021-03-091-2/+2
|\ \ \ \ \
| * | | | | Add Ethernet, TestNetworkSpecifier APIRemi NGUYEN VAN2021-03-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename StringNetworkSpecifier to EthernetNetworkSpecifier (its only production user), and make it module-lib API. The original StringNetworkSpecifier file is actually kept to satisfy some invalid dependencies; it will be removed separately. This allows specifying an Ethernet interface with a non-deprecated API: until this change the only way to do so would be to use NetworkRequest#setSpecifier(String), which is deprecated. Similarly, add the TestNetworkSpecifier API for TestNetworkManager, to replace previous usage of StringNetworkSpecifier. TestNetworkManager is module API, so TestNetworkSpecifier should be module API too. This allows tests to request the test interface specifically, without using the deprecated NetworkRequest#setSpecifier(String). Bug: 179329291 Test: m Change-Id: Iee569f5c8bbdc4bc979610e1191308281f3d4620
* | | | | | Communicate with BatteryStatsService through BatteryStatsManagerAaron Huang2021-03-081-8/+13
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mainline connectivity service is only allowed to use formal APIs. Use new system API in BatteryStatsManager instead of calling BatteryStatsService directly. Bug: 171686421 Test: FrameworksNetTests Change-Id: I1d1f0d2d456003e842ad77519667c0532995610d
* | | | | Merge "Applying OEM network pref to all users" am: c1a548b132 am: b6625e5976 ↵James Mattis2021-03-051-27/+189
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a5e243419a Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612760 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9988f9ecac19976dd78dbcf9a749adba5daa578c
| * | | | Merge "Applying OEM network pref to all users"James Mattis2021-03-051-27/+189
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Applying OEM network pref to all usersJames Mattis2021-03-041-27/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge "[FUI22] Support getAllNetworkStateSnapshot" am: 4c73e05c1d am: ↵Treehugger Robot2021-03-051-0/+82
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e1379b245 am: ee3fc01443 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614779 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I52f8339bd1cda35a3f26f28fd3c0165f6f6ff91e
| * | | | Merge "[FUI22] Support getAllNetworkStateSnapshot"Treehugger Robot2021-03-051-0/+82
| |\ \ \ \
| | * | | | [FUI22] Support getAllNetworkStateSnapshotjunyulai2021-03-041-0/+82
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Merge "Keystore 2.0: Make VPN Keystore 2.0 ready."Janis Danisevskis2021-03-052-60/+57
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Keystore 2.0: Make VPN Keystore 2.0 ready.Janis Danisevskis2021-03-032-60/+57
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | Unit test automation for Multi-Default TrackingJames Mattis2021-03-041-11/+293
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge changes Ie8d98359,I4d5cadfd am: 69508ee6db am: a2ca3e18cc am: 639ccdbd96Treehugger Robot2021-03-041-4/+3
|\| | | | |_|/ |/| | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612254 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7700b4ed9dd9105beb947944d63138330d8c565e
| * | Merge changes Ie8d98359,I4d5cadfdTreehugger Robot2021-03-041-4/+3
| |\ \ | | |/ | |/| | | | | | | | | | * changes: Fix a bug in RequestReassignment#toString Cleanup some of the PANS code
| | * Cleanup some of the PANS codeChalard Jean2021-03-031-4/+3
| | | | | | | | | | | | | | | Test: FrameworksNetTests Change-Id: I4d5cadfdd8e30a179948302e8c0c45f4d42b59ea