summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mady Mellor <madym@google.com> 2024-02-15 17:41:12 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-02-15 17:41:12 +0000
commit9009f3e9d96f208e7457e7f82f198b27a96fcbf0 (patch)
tree084d64bb8cbd83e64720b2d0a5e346f24f2727a2
parentb43432bc00ebecbb48272d4419c1f8af538a03ad (diff)
parent89dfe440839953ac4085643e3cc5c98133d9b025 (diff)
Merge "Make sure protolog tool is not required for system ui tests" into main
-rw-r--r--packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestCase.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestCase.java b/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestCase.java
index b62b3a211e58..353d9709b056 100644
--- a/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestCase.java
+++ b/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestCase.java
@@ -46,6 +46,7 @@ import androidx.core.animation.AndroidXAnimatorIsolationRule;
import androidx.test.InstrumentationRegistry;
import androidx.test.uiautomator.UiDevice;
+import com.android.internal.protolog.common.ProtoLog;
import com.android.systemui.broadcast.FakeBroadcastDispatcher;
import com.android.systemui.flags.SceneContainerRule;
@@ -170,6 +171,7 @@ public abstract class SysuiTestCase {
@Before
public void SysuiSetup() throws Exception {
+ ProtoLog.REQUIRE_PROTOLOGTOOL = false;
mSysuiDependency = new SysuiTestDependency(mContext, shouldFailOnLeakedReceiver());
mDependency = mSysuiDependency.install();
// TODO(b/292141694): build out Ravenwood support for Instrumentation