From c04e468bd435d75aa1c5ef0dadf8882c8f637033 Mon Sep 17 00:00:00 2001
From: Jacky Wang <jiannan@google.com>
Date: Wed, 16 Oct 2024 12:13:58 +0800
Subject: [PATCH] Enable catalyst test for NetworkDashboardScreenTest

Bug: 368355361
Flag: EXEMPT test only
Test: atest NetworkDashboardScreenTest
Change-Id: I06630abf88f833e69e4d28419f3ba9f6a2a355f3
---
 .../android/settings/network/NetworkDashboardScreenTest.kt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/robotests/src/com/android/settings/network/NetworkDashboardScreenTest.kt b/tests/robotests/src/com/android/settings/network/NetworkDashboardScreenTest.kt
index bb80f19d515..8318e09182f 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkDashboardScreenTest.kt
+++ b/tests/robotests/src/com/android/settings/network/NetworkDashboardScreenTest.kt
@@ -17,12 +17,15 @@ package com.android.settings.network
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.android.settings.flags.Flags
+import com.android.settings.testutils.shadow.ShadowConnectivityManager
 import com.android.settingslib.preference.CatalystScreenTestCase
 import com.google.common.truth.Truth.assertThat
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
 
 @RunWith(AndroidJUnit4::class)
+@Config(shadows = [ShadowConnectivityManager::class])
 class NetworkDashboardScreenTest : CatalystScreenTestCase() {
     override val preferenceScreenCreator = NetworkDashboardScreen()
 
@@ -35,5 +38,9 @@ class NetworkDashboardScreenTest : CatalystScreenTestCase() {
     }
 
     override fun migration() {
+        // Avoid thread hanging when TetheringManager.isTetheringSupported
+        ShadowConnectivityManager.getShadow().setTetheringSupported(true)
+
+        super.migration()
     }
 }