Remove workaround for unit test of collecting folding features
Test: unit test
Change-Id: I9c93d7e5f61c6c2ef64daefbc6358f895f892c04
diff --git a/compose/material3/adaptive/adaptive/src/androidMain/kotlin/androidx/compose/material3/adaptive/AndroidWindowAdaptiveInfo.android.kt b/compose/material3/adaptive/adaptive/src/androidMain/kotlin/androidx/compose/material3/adaptive/AndroidWindowAdaptiveInfo.android.kt
index 1e9ca7c..0a1ef44 100644
--- a/compose/material3/adaptive/adaptive/src/androidMain/kotlin/androidx/compose/material3/adaptive/AndroidWindowAdaptiveInfo.android.kt
+++ b/compose/material3/adaptive/adaptive/src/androidMain/kotlin/androidx/compose/material3/adaptive/AndroidWindowAdaptiveInfo.android.kt
@@ -16,7 +16,6 @@
package androidx.compose.material3.adaptive
-import android.app.Activity
import androidx.compose.runtime.Composable
import androidx.compose.runtime.State
import androidx.compose.runtime.collectAsState
@@ -73,15 +72,9 @@
fun collectFoldingFeaturesAsState(): State<List<FoldingFeature>> {
val context = LocalContext.current
return remember(context) {
- if (context is Activity) {
- // TODO(b/284347941) remove the instance check after the test bug is fixed.
- WindowInfoTracker
- .getOrCreate(context)
- .windowLayoutInfo(context)
- } else {
- WindowInfoTracker
- .getOrCreate(context)
- .windowLayoutInfo(context)
- }.map { it.displayFeatures.filterIsInstance<FoldingFeature>() }
+ WindowInfoTracker
+ .getOrCreate(context)
+ .windowLayoutInfo(context)
+ .map { it.displayFeatures.filterIsInstance<FoldingFeature>() }
}.collectAsState(emptyList())
}
