Revert "downgrade wifi unit tests to mockito 2.12"
Bug: 72052158
Test: ./frameworks/opt/net/wifi/tests/wifitests/runtest.sh
This reverts commit 5f34bbae024289a18379d1756c53f04fc66bafc2.
diff --git a/service/tests/wifitests/Android.mk b/service/tests/wifitests/Android.mk
index 3b0aab9..7c2e16f 100644
--- a/service/tests/wifitests/Android.mk
+++ b/service/tests/wifitests/Android.mk
@@ -59,7 +59,7 @@
# since neither is declared a static java library.
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \
- mockito-target-minus-junit4 \
+ mockito-target-inline-minus-junit4 \
frameworks-base-testutils \
services \
wifi-service \
@@ -108,6 +108,7 @@
libunwindstack \
libutils \
libvndksupport \
+ libdexmakerjvmtiagent \
ifdef WPA_SUPPLICANT_VERSION
LOCAL_JNI_SHARED_LIBRARIES += libwpa_client
diff --git a/service/tests/wifitests/AndroidManifest.xml b/service/tests/wifitests/AndroidManifest.xml
index dcb61c7..31eaac9 100644
--- a/service/tests/wifitests/AndroidManifest.xml
+++ b/service/tests/wifitests/AndroidManifest.xml
@@ -19,7 +19,9 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.server.wifi.test">
- <application>
+ <application
+ android:debuggable="true"
+ android:largeHeap="true">
<uses-library android:name="android.test.runner" />
<activity android:label="WifiTestDummyLabel"
android:name="WifiTestDummyName">
