5 Commits

Author	SHA1	Message	Date
Remi NGUYEN VAN	a6c06af0fa	Merge "Revert "Use mockito-extended in FrameworksNetTests""	2021-06-11 01:26:44 +00:00
xingdai	892a0ef152	Revert "Use mockito-extended in FrameworksNetTests" ... This reverts commit 98b76cc2ec. Reason for revert: <INSERT REASONING HERE> b/190622577 Change-Id: Ief39f82875e6fa885829aea62eed00f2f2e6774e	2021-06-10 21:41:54 +00:00
Remi NGUYEN VAN	f900c45afa	Deprecate MANAGE_ACTIVITY_STACKS permission ... This is a partial cherry-pick of change: I894ee66e058b1024a731d3be4b33b69626451f08 The permission is actually not used, but this change aligns the manifest with contents in downstream branches, so it can be modified (including removing the permission) without conflicts. Bug: 157876448 Test: atest FrameworksNetTests Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f Change-Id: Id50e41a0ea970350eae0a2afab303c022b452bf9	2021-06-09 19:28:10 +09:00
Remi NGUYEN VAN	98b76cc2ec	Use mockito-extended in FrameworksNetTests ... This is necessary to mock classes like BatteryStatsManager, which cannot be used without signature permissions, and to merge the test with other test suites that use mockito extended. Bug: 187935317 Test: atest FrameworksNetTests Change-Id: I5dba65d806c5d06b3ff8f633846edb911a7a44ec	2021-06-08 19:12:09 +09:00
Remi NGUYEN VAN	5ed250d90a	Move net unit tests to packages/Connectivity ... Move the tests together with packages/Connectivity code, so both can be moved to packages/modules/Connectivity together. Also reorganize unit tests in a unit/ directory, as other tests (integration/, common/ etc.) have been added in tests/net since they were created. This makes the directory structure consistent. Test: atest FrameworksNetTests Bug: 187814163 Merged-In: I254ffd1c08ec058d594b4ea55cbae5505f8497cc Change-Id: I254ffd1c08ec058d594b4ea55cbae5505f8497cc	2021-05-13 08:30:33 +00:00