joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Disable Play auto-update during tests

Browse source 
For devices using Play services, disable auto-update during tests, as it
may interfere with them. For example, Webview may be killed if it is
opened while the update is applied.

Bug: 263665773
Test: atest
Change-Id: I9613d739ad0763c882a1971879aa743f4541a75c
This commit is contained in:
Remi NGUYEN VAN 2023-05-09 16:15:29 +09:00
commit 90edff826a
1 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

21
staticlibs/testutils/host/com/android/testutils/ConnectivityTestTargetPreparer.kt
View file

@ -48,6 +48,11 @@ open class ConnectivityTestTargetPreparer : BaseTargetPreparer() {
override fun setUp(testInformation: TestInformation) {
if (isDisabled) return
disableGmsUpdate(testInformation)
runPreparerApk(testInformation)
}
private fun runPreparerApk(testInformation: TestInformation) {
installer.setCleanApk(true)
installer.addTestFileName(CONNECTIVITY_CHECKER_APK)
installer.setShouldGrantPermission(true)
@ -90,8 +95,22 @@ open class ConnectivityTestTargetPreparer : BaseTargetPreparer() {
testInformation.device.deviceDescriptor)
}
override fun tearDown(testInformation: TestInformation?, e: Throwable?) {
private fun disableGmsUpdate(testInformation: TestInformation) {
// This will be a no-op on devices without root (su) or not using gservices, but that's OK.
testInformation.device.executeShellCommand("su 0 am broadcast " +
"-a com.google.gservices.intent.action.GSERVICES_OVERRIDE " +
"-e finsky.play_services_auto_update_enabled false")
}
private fun clearGmsUpdateOverride(testInformation: TestInformation) {
testInformation.device.executeShellCommand("su 0 am broadcast " +
"-a com.google.gservices.intent.action.GSERVICES_OVERRIDE " +
"--esn finsky.play_services_auto_update_enabled")
}
override fun tearDown(testInformation: TestInformation, e: Throwable?) {
if (isTearDownDisabled) return
installer.tearDown(testInformation, e)
clearGmsUpdateOverride(testInformation)
}
}