commit 98b76cc2ec58396c804a4e4f658c915b3c80c138
author Remi NGUYEN VAN <reminv@google.com> Fri Jun 04 18:51:25 2021 +0900
committer Remi NGUYEN VAN <reminv@google.com> Tue Jun 08 19:12:09 2021 +0900
tree 7c7b94653628d6a960390d5c51c6917924c68e18
parent e2791b00d347936d5785aced53e870cd40d6f9b2

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

tests/unit/AndroidManifest.xml

diff --git a/tests/unit/AndroidManifest.xml b/tests/unit/AndroidManifest.xml
index d08b2f8..18653dc 100644
--- a/tests/unit/AndroidManifest.xml
+++ b/tests/unit/AndroidManifest.xml
@@ -50,7 +50,8 @@
     <uses-permission android:name="android.permission.NETWORK_STATS_PROVIDER" />
     <uses-permission android:name="android.permission.CONTROL_OEM_PAID_NETWORK_PREFERENCE" />
 
-    <application>
+    <!-- Debuggable is necessary for mockito extended -->
+    <application android:debuggable="true">
         <uses-library android:name="android.test.runner" />
         <uses-library android:name="android.net.ipsec.ike" />
     </application>