summaryrefslogtreecommitdiff
path: root/service-t/src
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | [DU03-1]Remove INetworkStatsService from BatteryStatsImpllifr2022-01-211-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose systemapi NetworkStats.getDetailedUidStats for use by BatteryStats. BatteryStatsImpl is using INetworkStatsService APIs, which cannot be accessed after moving into the mainline module. So, replace and remove those hidden API usages. Bug: 210066922 Test: atest BatteryStatsImplTest WifiPowerCalculatorTest MobileRadioPowerCalculatorTest NetworkStatsServiceTest CTS-Coverage-Bug: 213437796 Change-Id: I40d713923278f4654d67bb4d12155cea85c10447
| | | * | | | Merge changes from topic "ms57-migrationapi"Junyu Lai2022-01-211-15/+13
| | | |\| | | | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | * changes: [MS57.1] Prepare APIs for data migration utility [MS45] Expose SystemApis to query summary and history with template
| | | | * | [MS57.1] Prepare APIs for data migration utilityJunyu Lai2022-01-201-15/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes: 1. Move PREFIX_* constants to NetworkStatsManager to expose in later changes. 2. Rename networkId to wifiNetworkKey. 3. Rename subType to ratType. 4. Replace SUBTYPE_COMBINED with NETWORK_TYPE_ALL 5. Fix lint errors when exposing system api. Test: TH Bug: 204830222 Change-Id: I2b7c34958bc59c3225c96f12abba008b83101585
| | | * | | Merge "[DU05]Remove the android.provider.Settings.Global in NetworkStatsService"Frank Li2022-01-211-52/+20
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | [DU05]Remove the android.provider.Settings.Global in NetworkStatsServiceFrank2022-01-201-53/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace android.provider.Settings.Global methods that return the default value and hardcoding them inside the methods. Bug: 213329727 Test: atest NetworkStatsServiceTest Change-Id: I51d686222f983c8deb71d4b32f9e443e87a5e53e
| | | * | | [MS41.1] Prepare for APIs for querying usage with templateJunyu Lai2022-01-201-5/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL includes: 1. Prepare for queryDetailsForDevice which allows callers to query history of networks that matches the given template. 2. Prepare for queryDetailsForUidTagState, which allows callers to query history uid stats with the given template, uid and other conditions. 3. Enforce fine location permission if the caller is querying data usage with a template which contains wifi network keys. Test: atest NetworkStatsServiceTest NetworkStatsManagerTest Bug: 204830222 Bug: 200768422 Change-Id: I6783d6bfd6e075e0b3ec8a3c91836377f1d71c7a
| | | * | | Merge changes I16418791,I210f5ddcJunyu Lai2022-01-191-10/+23
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: [MS37.1] Expose APIs which is used by NPMS [MS55] Remove INetworkStats dependency from DataIdleTest
| | | | * | | [MS37.1] Expose APIs which is used by NPMSJunyu Lai2022-01-191-10/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: TH Bug: 204830222 CTS-Coverage-Bug: 213124616 Change-Id: I16418791246b12fc3da7348ed36b58274e20db54
| | | * | | | [DU04-1]Remove NetworkPolicyManagerInternal from NetworkStatsServicelifr2022-01-181-2/+1
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose system APIs for use by NetworkStatsService. Bug: 211843446 Test: atest NetworkStatsServiceTest NetworkPolicyManagerTest NetworkPolicyManagerServiceTest Change-Id: I56a066b7f4b4c2c8fefdd185c2e50de63b1e2629
| | | * | | Merge changes If51b6676,Ia6863a70,I802d2316Junyu Lai2022-01-171-54/+18
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: [MS37] Replace NetworkStatsManagerInternal usages in NPMS [MS36] Remove unused getNetwork[Total|Uid]Bytes [MS35] Remove getNetwork[Total|Uid]Bytes dependencies from NPMS
| | | | * | [MS37] Replace NetworkStatsManagerInternal usages in NPMSJunyu Lai2022-01-151-34/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is done by: 1. Add NetworkStatsManagerInternal APIs directly from NetworkStatsManager, these APIs are needed by NPMS. 2. Replace all usages with these APIs. 3. Delete NetworkStatsManagerInternal implementation. Test: atest FrameworksNetTests NetworkPolicyManagerServiceTest Bug: 204830222 CTS-Coverage-Bug: 213124616 Change-Id: If51b6676915e3a0a8a9f95221d735306911442fc
| | | | * | [MS36] Remove unused getNetwork[Total|Uid]BytesJunyu Lai2022-01-151-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the usages are all removed, clean up the unused code accordingly. Test: TH Bug: 204830222 Change-Id: Ia6863a7098632580b411bd79550754e511ea2543
| | | * | | Merge "[DU04]Remove NetworkPolicyManagerInternal from NetworkStatsService"Frank Li2022-01-151-5/+10
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | [DU04]Remove NetworkPolicyManagerInternal from NetworkStatsServicelifr2022-01-151-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NetworkStatsService is using NetworkPolicyManagerInternal APIs, which cannot be accessed after moving into the mainline module. So, replace and remove those hidden API usages. Bug: 211843446 Test: atest NetworkStatsServiceTest NetworkPolicyManagerTest NetworkPolicyManagerServiceTest Change-Id: I0f3f02d1dc014967fab27ffcf37dd1918dbef5e0
| | | * | | [MS43] Remove EventLogTags depdendencyJunyu Lai2022-01-151-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inline functions and copy constants to the service. Test: TH Bug: 204830222 Change-Id: Idf5c8ff7c7fec39530269b3c6b24475407198fbc
| | | * | | Merge "[MS44.1] Add API to query tagged UID summary"Junyu Lai2022-01-131-2/+12
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | [MS44.1] Add API to query tagged UID summaryJunyu Lai2022-01-131-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Query tagged UID summary is currently needed by StatsPullAtomService to collect tagged traffic statistics. Add an Api via NetworkStatsManager to support this functionality. Test: atest NetworkStatsManagerTest Bug: 204830222 Change-Id: Iaa54482a8109b56e66e829c5bec5a8a8f466641a
| | | * | | Merge "[DU01]Remove INetworkManagementService from NetworkStatsService"Frank Li2022-01-131-45/+64
| | | |\ \ \
| | | | * | | [DU01]Remove INetworkManagementService from NetworkStatsServicelifr2022-01-081-45/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NetworkStatsService is using INetworkManagementService APIs, which cannot be accessed after moving into the mainline module. So, replace and remove those hidden API usages. Bug: 209738761 Test: atest NetworkStatsServiceTest Change-Id: I5740f6d8a54e9a06c6dbb93203cb4c954383c3c8
| | | * | | | [DU03]Remove INetworkStatsService from BatteryStatsImpllifr2022-01-121-0/+1
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BatteryStatsImpl is using INetworkStatsService APIs, which cannot be accessed after moving into the mainline module. So, replace and remove those hidden API usages. Bug: 210066922 Test: atest BatteryStatsImplTest WifiPowerCalculatorTest MobileRadioPowerCalculatorTest CTS-Coverage-Bug: 213437796 (cherry-picked from ag/16548638) Change-Id: I584897ff8ba303c717a9df3756c9f6778c1cfb10 Merged-In: I584897ff8ba303c717a9df3756c9f6778c1cfb10
| | | * | | [MS42.1] Replace PhoneStateListener with DisplayInfoListenerJunyu Lai2022-01-101-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several methods and constants are hidden in PhoneStateListener and ServiceState to track Radio Access Technology(RAT) types. Replace them with public API instead. Test: atest NetworkStatsSubscriptionsMonitorTest Fix: 213021103 Change-Id: I588398da7f2b031910a8350a7d84405ff101232d
| | | * | | [MS39.1] Remove the looper from NetworkStatsSubscriptionMonitorJunyu Lai2022-01-072-7/+5
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OnSubscriptionsChangedListenerHandler(Looper looper) is hidden, there is no way to pass a looper to it in the test. This change partially revert aosp/1340040 to fix hidden API dependency. And will use a different approach to address this problem in later stages. Test: atest NetworkStatsSubscriptionMonitorTest Bug: 204830222 Bug: 213280079 Change-Id: I429be3578d599de9a5a3f78b02387c20744b37d3
| | | * | Merge "[MS32.1] Remove TetheringManager#ACTION_TETHER_STATE_CHANGED usage"Junyu Lai2022-01-061-11/+14
| | | |\ \
| | | | * | [MS32.1] Remove TetheringManager#ACTION_TETHER_STATE_CHANGED usageJunyu Lai2022-01-061-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace intent receiver with callback listener. Test: atest com.android.server.net.NetworkStatsServiceTest Bug: 204830222 Change-Id: I585b2bb471b59cbca3cce1c01ce527dff87f42da
| | | * | | Merge changes from topics "ms34-tm", "ms40-clock"Junyu Lai2022-01-062-2/+3
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: [MS09] Expose NetworkTemplate APIs which are needed by NetworkPolicy [MS34.1] Replace TelephonyManager#getSubscriberId(subId) with public API [MS40.1] Remove Clock dependencies from NetworkStatsService [MS27] Expose noteUntaggedSocket SystemApi
| | | | * | [MS34.1] Replace TelephonyManager#getSubscriberId(subId) with public APIJunyu Lai2022-01-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: atest com.android.server.net.NetworkStatsSubscriptionsMonitorTest Bug: 204830222 Change-Id: I57aa4470aea1715217fa7d74f2c9067b096d1bae
| | | | * | [MS40.1] Remove Clock dependencies from NetworkStatsServiceJunyu Lai2022-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes: 1. Re-implement the BestClock in the static library. 2. Expose SystemClock#currentNetworkTimeClock as public Api Test: TH Bug: 204830222 CTS-Coverage-Bug: 213393821 Exempt-From-Owner-Approval: 1. Owner approved the change with explicitly granted submission after adderessing the straight-forward comment. 2. Owner is OOO for 3 months. Change-Id: I08c0162a7101cc6184f3eca3d4a59211183fb843
| | | * | | Remove ParcelFileDescriptor hidden API usage from IpSecServiceAaron Huang2022-01-061-10/+26
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IpSec service is going to be a part of Connectivity mainline module and ParcelFileDescriptor(FileDescriptor) is a hidden API that cannot be used by mainline module. Therefore, use ParcelFileDescriptor.dup(FileDescriptor) to get a ParcelFileDescriptor instead. Bug: 204153604 Test: FrameworksNetTests Change-Id: I0ccabdfc5060f4b635e9a7009a67fbd5d32002fd
| | | * | [MS33.1] Remove NetdService dependencyJunyu Lai2022-01-052-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change pass INetd to NetworkStatsFactory to replace NetdService#getNetdInstance. Test: atest FrameworksNetTests Bug: 204830222 Change-Id: I39b278989cea06dd316f21214380b5c4b54d2d50
| | | * | Merge "[MS31] Fix several hidden API usages"Treehugger Robot2022-01-044-30/+31
| | | |\ \
| | | | * | [MS31] Fix several hidden API usagesJunyu Lai2022-01-034-30/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes: 1. Replace UserHandle.getUid(userId, appId) with public API 2. Remove Preconditions.checkArgument 3. Replace MathUtil.constrain with the one in NetworkStatsUtils 4. Remove Sets 5. Replace NetworkStack.checkNetworkStackPermission with the one in the PermissionUtils 6. Replace internal CollectionUtils with the one in the module 7. Inline ProtoOutputStream(fd) 8. Replace Intent.EXTRA_USER_HANDLE with Intent.EXTRA_USER Test: atest NetworkStatsSubscriptionsMonitorTest \ NetworkStatsServiceTest Bug: 204830222 Change-Id: If06a27b04ad15c29052b670eefc2f6dc0d199420
| | | * | | Merge changes from topics "ms25-appops", "ms28-service-fix"Treehugger Robot2022-01-034-51/+53
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: [MS25.1] Remove AppOpsManager.OP_GET_USAGE_STATS dependency [MS28.1] Fix several hidden API dependencies
| | | | * | [MS28.1] Fix several hidden API dependenciesJunyu Lai2021-12-304-51/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes: 1. Replace Slog with Log 2. Use android.util.IndentingPrintWriter instead of the deprecated internal one. 3. Replace usages of ArrayUtils with CollectionUtils. 4. Reimplement DumpUtils#checkDumpPermission in PermissionUtils. 5. Replace MathUtils.constrain with NetworkStatsUtils.constrain Test: FrameworksNetTests Bug: 204830222 Change-Id: I2b064fc25497288d66018584e66da98c79bd208d
| | | * | | Merge "[MS26.1] Remove Process.NETWORK_STACK_UID dependency"Treehugger Robot2021-12-301-1/+1
| | | |\| |
| | | | * | [MS26.1] Remove Process.NETWORK_STACK_UID dependencyJunyu Lai2021-12-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check NetworkStack permission instead. Test: NetworkStatsAccessTest Bug: 204830222 Change-Id: I052a1422d145af533b036b0f017ace485b67cbfe
| | | * | | [MS18] Augment data usage by defaultJunyu Lai2021-12-241-4/+0
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow-up from ag/2815797, callers who uses the hidden API will have their data augmented by default, and the public API offers a way to opt-into augmentation. However, since the data usage is going to the module. All the hidden API usage must be eliminated. Also, from user perspective, it is better for UI and API to have aligned behavior. Thus, enable augment data usage for public API callers. Test: atest FrameworksNetTests \ android.app.usage.cts.NetworkUsageStatsTest Bug: 204830222 Change-Id: Ida254fac8d44c32d388f1886a866f7324a41ce75
| | | * | Merge "Move Ethernet related files to f/b/packages/ConnectivityT."Xiao Ma2021-12-161-0/+449
| | | |\ \
| | | | * | Move Ethernet related files to f/b/packages/ConnectivityT.Xiao Ma2021-12-161-0/+449
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ethernet-service is going to be moved into Connectivity mainline module. Move all ethernet related files in f/b/ to f/b/packages/ConnectivityT so that it's easier to migrate these files to Connectivity module finally after clearing the hidden API usages. Below files to be moved: Ethernet framework related files: - EthernetManager.java - EthernetNetworkSpecifier.java - IEthernetManager.aidl - IEthernetServiceListener.aidl - ITetheredInterfaceCallback.aidl Ethernet service related files: - IpConfigStore.java(EthernetConfigStore has dependency on the class) For the ethernet-service related files, keep it as-is temproraliy and fix the hiden API dependencies in f/opt/net/ethernet/. After this work is done, then migrating the whole of ethernet folder to Connectivity module completely. This CL also fixes some minor errors of code style format to pass the code style check. Bug: 210586283 Test: build pass atest FrameworksNetTests atest EthernetServiceTests Change-Id: Ib359d29d5221105f648bc4194c6d6dbe4cc6e3e5
| | | * | | Remove NetdService usage from IpSecServiceAaron Huang2021-12-151-116/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IpSecService is going to be moved into ConnectivityService module. So, NetdService won't be visible to IpSecService since it is a hidden class. NetdService.get(timeout) is a method that blocks for specified time until INetd instance is available. In SystemServer IpSecService is created after NetworkManagementService and NMS uses NetdService.get() to get INetd instance which is a method that blocks until an INetd instance is available. Thus, connectNativeNetdService can be removed because NMS already waits for INetd instance is available so IpSecService should be able to get INetd instance immediately. Bug: 204153604 Test: FrameworksNetTest Change-Id: I007cb28de63783d60084f93dddb4de78faa0e868
| | | * | | Refactor IpSecServiceConfiguration to DependenciesAaron Huang2021-12-141-45/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IpSecService is going to be moved into ConnectivityService module, so the hidden API usage should be removed. NetdService.getNetdInstance is a hidden API, therefore the alternative is to get the instance by Context.getSystemService. Bug: 204153604 Test: FrameworksNetTests Change-Id: I1bd8efc03c37654d12a8eadd3e78ed45e10b5691
| | | * | | Fix style errors for IpSec associated filesAaron Huang2021-12-141-16/+17
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 204153604 Test: build pass. Change-Id: I940de8bef7f693dcce8808148a975bea1f36712c
| | | * | Move IpSec associated files to f/b/packages/ConnectivityTAaron Huang2021-12-141-0/+1917
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IpSecService is going to be moved into Connectivity mainline module. Move all ipsec associated files to packages/ConnectivityT so that it can be easily migrate these files to connectivity module after clearing the hidden API usages. Bug: 204153604 Test: build pass FrameworksNetTests CtsNetTestCases Change-Id: I562b47f18e345988a2638cf886f86818f9144b91
| | | * | [MS07.1] Move NetworkStatsCollection/IdentitySet into frameworksJunyu Lai2021-12-106-1210/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These files are needed for the data migration util system Api interfaces to allow OEMs to construct NetworkStats* objects. Thus, they need to be moved into android.net package, and some of them will be exposed as @SystemApi in T. Eventually these classes will be moved into the Connectivity module, but in the mean time they will be temporarily moved to f/b/package/ConnectivityT for the preparation stage. However, the tests are already in the module. Therefore for the S-derived branch, the test cannot see the renamed classes since any framework CLs will not be auto-merged into this branch. Thus, the tests need to stay disabled on the S-derived branch, and will be re-enabled after all files are moved into the module. Test: TH Bug: 197717846 Change-Id: I95278a99cf2437ada28001161ceea17a1d32f2a4
| | | * | [MS08] Move NetworkStats files to f/b/package/ConnectivityTJunyu Lai2021-12-108-0/+5142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NetworkStatsService is going to be moved into ConnectivityService module. Move all related files to packages/ConnectivityT so that it can be easily migrate these files to connectivity module after clearing the hidden API usages. Bug: 197717846 Test: TH Change-Id: Iead00832b5eb7b1dc40a92027c5a14ae8316b16c
| | | * | Move f/b/packages/Nsd files to f/b/packages/ConnectivityTAaron Huang2021-12-096-0/+2124
| | | / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Nsd files to ConnectivityT so that nsd, ipsec, ethernet and netstats files can live in the same directory and it will be easier to move everything in frameworks/base/packages/ConnectivityT to packages/modules/Connectivity after fixing all of the hidden API usages. Bug: 204153604 Test: FrameworksNetTests CtsNetTestCases Change-Id: I411e242e8739d15920cfc2fe274115f7f39bd89f
* | | | Merge changes Id533cdb4,I6a9ce3d6,I345bf073 into sc-mainline-prod am: c3315f2560Remi NGUYEN VAN2022-04-011-114/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/17530925 Change-Id: I9e1375f47ab85db92cf602f0be63bac0160aab78 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | Merge EthernetServiceTests into FrameworksNetTestsRemi NGUYEN VAN2022-04-011-114/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per the TODO, merge EthernetServiceTests into the larger FrameworksNetTests suite. Similarly to NetworkStats, NSD or IpSec tests, the tests are also marked as "non-connectivity-module-test", where "module" actually refers to modules being built for release (from an S-based branch) today. This is necessary as the tests and associated code cannot build without T APIs. Also add FrameworksNetTests to presubmit as non-connectivity-module tests are not run in presubmit without this. Test: TH Ignore-AOSP-First: Merged in topic, will be cherry-picked Change-Id: Id533cdb4ac184b963f570af299dea04754ba88e9
| * | | Merge history of opt/net/ethernetRemi NGUYEN VAN2022-03-316-0/+2226
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed files/directories: java/ --> service-t/src/ tests/ --> tests/ethernet/ Android.bp --> (removed) OWNERS --> (removed) .gitignore --> (removed) BUG: 222234190 TEST: TH Ignore-AOSP-First: Move with history done per-branch Merged-In: I06e2568e5e01d855783383552d1b0d7732cefbe0 Change-Id: I37afd5815c471479c3679beae06e47b9ea845044
| * \ \ \ Merge history of ConnectivityTRemi NGUYEN VAN2022-03-2421-0/+9275
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed files/directories: ConnectivityT/service/Android.bp --> service-t/Sources.bp ConnectivityT/framework-t/Android.bp --> framework-t/Sources.bp ConnectivityT/framework-t/aidl-export --> framework/aidl-export ConnectivityT/service --> service-t ConnectivityT/framework-t --> framework-t ConnectivityT/tests --> tests ConnectivityT/OWNERS --> (removed) BUG: 222234190 TEST: TH Ignore-AOSP-First: Move with history done per-branch Merged-In: I87843d554d1e726158f8784aa2ec61c92867ad3e Change-Id: I7a11af7a1fc124dff2372efe275d59855255df7b
| | * | | Merge "Fix proto invalid write type"Aaron Huang2022-03-222-10/+10
| | |\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-22 21:16:48 +0000