From 009e3b3f92386e4f3a583a054683fba49355582a Mon Sep 17 00:00:00 2001 From: Ben Reich Date: Fri, 28 Feb 2025 21:16:42 +1100 Subject: Remove redirect_get_content and add read-only variant Turns out when I added this flag initially I forgot the is_fixed_read_only property. This has inadvertently caused the AndroidManifest.xml to retain the key android:featureFlag against the TrampolineActivity. When I change it to read-only, it actually compiles the property out of the AndroidManifest and retains one or the other. Unfortunately flags which incorrectly set this property can't be updated, they have to be abandoned. So let's use redirect_get_content_ro to fix this mishap. http://ag/32017425 is rolling the existing flag back, so will submit this CL once that has landed. Bug: 377771195 Flag: com.android.documentsui.flags.redirect_get_content_ro Test: atest com.android.documentsui.picker.TrampolineActivityTest Change-Id: I4e41c0ab87ebc59272faef5351fefddbf5873654 --- tests/functional/com/android/documentsui/TrampolineActivityTest.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/functional/com/android/documentsui/TrampolineActivityTest.kt b/tests/functional/com/android/documentsui/TrampolineActivityTest.kt index 76d703701..6bf0975ad 100644 --- a/tests/functional/com/android/documentsui/TrampolineActivityTest.kt +++ b/tests/functional/com/android/documentsui/TrampolineActivityTest.kt @@ -30,7 +30,7 @@ import androidx.test.platform.app.InstrumentationRegistry import androidx.test.uiautomator.By import androidx.test.uiautomator.UiDevice import androidx.test.uiautomator.Until -import com.android.documentsui.flags.Flags.FLAG_REDIRECT_GET_CONTENT +import com.android.documentsui.flags.Flags.FLAG_REDIRECT_GET_CONTENT_RO import com.android.documentsui.picker.TrampolineActivity import java.util.Optional import java.util.regex.Pattern @@ -79,7 +79,7 @@ class TrampolineActivityTest() { } @RunWith(Parameterized::class) - @RequiresFlagsEnabled(FLAG_REDIRECT_GET_CONTENT) + @RequiresFlagsEnabled(FLAG_REDIRECT_GET_CONTENT_RO) class ShouldLaunchCorrectPackageTest { enum class AppType { PHOTOPICKER, @@ -203,7 +203,7 @@ class TrampolineActivityTest() { } @RunWith(AndroidJUnit4::class) - @RequiresFlagsEnabled(FLAG_REDIRECT_GET_CONTENT) + @RequiresFlagsEnabled(FLAG_REDIRECT_GET_CONTENT_RO) class RedirectTest { @get:Rule val checkFlagsRule: CheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule() -- cgit v1.2.3-59-g8ed1b