Message	SHA1
Merge "Revert "Use mockito-extended in FrameworksNetTests"" am: a6c06af0fa am: 6f6035a29e ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1734372 Change-Id: I8c8a2f734c433c0cf6fe158fcbf26a75a82d0d0a Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-06-11 01:56:43 +00:00	9134dac0b1
Revert "Use mockito-extended in FrameworksNetTests" ... This reverts commit 98b76cc2ec. Reason for revert: <INSERT REASONING HERE> b/190622577 Change-Id: Ief39f82875e6fa885829aea62eed00f2f2e6774e xingdai   commited 2021-06-10 21:41:54 +00:00	892a0ef152
Merge "Use mockito-extended in FrameworksNetTests" am: 35e6108119 am: 98ea169c22 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727825 Change-Id: I0fb914110ec6e2c34544831619157f05a8e57661 Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-06-09 09:14:57 +00:00	4b6239c2c8
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 Remi NGUYEN VAN   commited 2021-06-08 19:12:09 +09:00	98b76cc2ec
Add more unit tests for ConnectivityManager S APIs ... Ignore-AOSP-First: Avoid merge conflict Test: atest android.net.ConnectivityManagerTest Bug: 188657173 Change-Id: I33612650eb89486a14fcfc440ba0c357f4bb513c Junyu Lai   commited 2021-05-19 15:34:38 +00:00	ffda3053d1
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 Remi NGUYEN VAN   commited 2021-05-13 08:30:33 +00:00	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 Ignore-AOSP-First: needs per-branch move for merge conflicts Change-Id: I254ffd1c08ec058d594b4ea55cbae5505f8497cc Remi NGUYEN VAN   commited 2021-05-13 05:55:44 +00:00	678277cc03