fix device health check and convert to androidx
It's been broken for a while because permission scheme has
changed. Fixing it for now by sharing uid with system therefore
obtaining most if not all of the special permissions
Bug: 126760989
Test: atest DeviceHealthChecks # with manually triggered crashes
Change-Id: I9cf31091b4232168d74aaf0e5cfead0960f59b61
diff --git a/tests/functional/devicehealthchecks/Android.bp b/tests/functional/devicehealthchecks/Android.bp
index 295b5ec..c407d96 100644
--- a/tests/functional/devicehealthchecks/Android.bp
+++ b/tests/functional/devicehealthchecks/Android.bp
@@ -21,7 +21,8 @@
sdk_version: "current",
certificate: "platform",
static_libs: [
- "android-support-test",
+ "androidx.test.rules",
+ "androidx.test.runner",
"platform-test-annotations",
],
diff --git a/tests/functional/devicehealthchecks/AndroidManifest.xml b/tests/functional/devicehealthchecks/AndroidManifest.xml
index 597bc21..1a57e13 100644
--- a/tests/functional/devicehealthchecks/AndroidManifest.xml
+++ b/tests/functional/devicehealthchecks/AndroidManifest.xml
@@ -16,18 +16,16 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.devicehealthchecks"
- android:sharedUserId="com.android.devicehealthchecks"
+ android:sharedUserId="android.uid.system"
android:versionCode="1"
android:versionName="1.0" >
- <uses-permission android:name="android.permission.READ_LOGS" />
-
<uses-sdk
android:minSdkVersion="22"
android:targetSdkVersion="25" />
<instrumentation
- android:name="android.support.test.runner.AndroidJUnitRunner"
+ android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.devicehealthchecks" />
<application>
diff --git a/tests/functional/devicehealthchecks/AndroidTest.xml b/tests/functional/devicehealthchecks/AndroidTest.xml
index 594a510..e3a211a 100644
--- a/tests/functional/devicehealthchecks/AndroidTest.xml
+++ b/tests/functional/devicehealthchecks/AndroidTest.xml
@@ -21,6 +21,5 @@
<option name="test-tag" value="DeviceHealthChecks" />
<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
<option name="package" value="com.android.devicehealthchecks" />
- <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
</test>
</configuration>
diff --git a/tests/functional/devicehealthchecks/src/com/android/devicehealthchecks/CrashCheck.java b/tests/functional/devicehealthchecks/src/com/android/devicehealthchecks/CrashCheck.java
index 2860338..baa3a34 100644
--- a/tests/functional/devicehealthchecks/src/com/android/devicehealthchecks/CrashCheck.java
+++ b/tests/functional/devicehealthchecks/src/com/android/devicehealthchecks/CrashCheck.java
@@ -16,7 +16,8 @@
package com.android.devicehealthchecks;
import android.platform.test.annotations.GlobalPresubmit;
-import android.support.test.runner.AndroidJUnit4;
+
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/tests/functional/devicehealthchecks/src/com/android/devicehealthchecks/CrashCheckBase.java b/tests/functional/devicehealthchecks/src/com/android/devicehealthchecks/CrashCheckBase.java
index e020da3..a2cf8eb 100644
--- a/tests/functional/devicehealthchecks/src/com/android/devicehealthchecks/CrashCheckBase.java
+++ b/tests/functional/devicehealthchecks/src/com/android/devicehealthchecks/CrashCheckBase.java
@@ -17,9 +17,10 @@
import android.content.Context;
import android.os.DropBoxManager;
-import android.support.test.InstrumentationRegistry;
import android.util.Log;
+import androidx.test.InstrumentationRegistry;
+
import org.junit.Assert;
import org.junit.Before;
diff --git a/tests/functional/devicehealthchecks/src/com/android/devicehealthchecks/SensorsBootCheck.java b/tests/functional/devicehealthchecks/src/com/android/devicehealthchecks/SensorsBootCheck.java
index 93a623f..c4c1a61 100644
--- a/tests/functional/devicehealthchecks/src/com/android/devicehealthchecks/SensorsBootCheck.java
+++ b/tests/functional/devicehealthchecks/src/com/android/devicehealthchecks/SensorsBootCheck.java
@@ -20,11 +20,11 @@
import android.hardware.Sensor;
import android.hardware.SensorManager;
import android.platform.test.annotations.GlobalPresubmit;
-import android.support.test.InstrumentationRegistry;
+
+import androidx.test.InstrumentationRegistry;
import org.junit.Assert;
import org.junit.Before;
-import org.junit.runner.RunWith;
import org.junit.Test;
/*
