Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 835ff635 authored by Vadim Tryshev's avatar Vadim Tryshev
Browse files

Skiping view capture collection in Launcher3 tests to avoid hidden API check exception. 

Bug: 187761685
Test: presubmit
Flag: N/A
Change-Id: Ic739c045a80ded6a4407e3c151fe6abcf46de53c
parent b75add7a

tests/src/com/android/launcher3/util/rule/FailureWatcher.java

+2 −1
Original line number Diff line number Diff line
@@ -103,7 +103,8 @@ public class FailureWatcher extends TestWatcher { 


            if (viewCaptureDataSupplier != null) {

                out.putNextEntry(new ZipEntry("FS/data/misc/wmtrace/failed_test.vc"));

                viewCaptureDataSupplier.get().writeTo(out);

                final ExportedData exportedData = viewCaptureDataSupplier.get();

                if (exportedData != null) exportedData.writeTo(out);

                out.closeEntry();

            }

        } catch (Exception ignored) {

tests/src/com/android/launcher3/util/rule/ViewCaptureRule.kt

+8 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.app.Application 
import android.media.permission.SafeCloseable

import android.os.Bundle

import androidx.test.core.app.ApplicationProvider

import androidx.test.platform.app.InstrumentationRegistry

import com.android.app.viewcapture.SimpleViewCapture

import com.android.app.viewcapture.ViewCapture.MAIN_EXECUTOR

import com.android.app.viewcapture.data.ExportedData
@@ -50,6 +51,13 @@ class ViewCaptureRule(var alreadyOpenActivitySupplier: Supplier<Activity?>) : Te 
        private set



    override fun apply(base: Statement, description: Description): Statement {

        // Skip view capture collection in Launcher3 tests to avoid hidden API check exception.

        if (

            "com.android.launcher3.tests" ==

                InstrumentationRegistry.getInstrumentation().context.packageName

        )

            return base



        return object : Statement() {

            override fun evaluate() {

                viewCaptureData = null