Merge "Remove redirect_get_content and add read-only variant" into main (0401dae0) · Commits · e / os / android_packages_apps_DocumentsUI

AndroidManifest.xml

+5 −5

Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@
		android:name=".picker.TrampolineActivity"
		android:exported="true"
		android:theme="@android:style/Theme.NoDisplay"
		android:featureFlag="com.android.documentsui.flags.redirect_get_content"
		android:featureFlag="com.android.documentsui.flags.redirect_get_content_ro"
		android:visibleToInstantApps="true">
		<intent-filter android:priority="120">
		<action android:name="android.intent.action.OPEN_DOCUMENT" />
		@@ -95,7 +95,7 @@
		android:theme="@style/LauncherTheme"
		android:visibleToInstantApps="true">
		<intent-filter
		android:featureFlag="!com.android.documentsui.flags.redirect_get_content"
		android:featureFlag="!com.android.documentsui.flags.redirect_get_content_ro"
		android:priority="100">
		<action android:name="android.intent.action.OPEN_DOCUMENT" />
		<category android:name="android.intent.category.DEFAULT" />
		@@ -103,7 +103,7 @@
		<data android:mimeType="/" />
		</intent-filter>
		<intent-filter
		android:featureFlag="!com.android.documentsui.flags.redirect_get_content"
		android:featureFlag="!com.android.documentsui.flags.redirect_get_content_ro"
		android:priority="100">
		<action android:name="android.intent.action.CREATE_DOCUMENT" />
		<category android:name="android.intent.category.DEFAULT" />
		@@ -111,7 +111,7 @@
		<data android:mimeType="/" />
		</intent-filter>
		<intent-filter
		android:featureFlag="!com.android.documentsui.flags.redirect_get_content"
		android:featureFlag="!com.android.documentsui.flags.redirect_get_content_ro"
		android:priority="100">
		<action android:name="android.intent.action.GET_CONTENT" />
		<category android:name="android.intent.category.DEFAULT" />
		@@ -119,7 +119,7 @@
		<data android:mimeType="/" />
		</intent-filter>
		<intent-filter
		android:featureFlag="!com.android.documentsui.flags.redirect_get_content"
		android:featureFlag="!com.android.documentsui.flags.redirect_get_content_ro"
		android:priority="100">
		<action android:name="android.intent.action.OPEN_DOCUMENT_TREE" />
		<category android:name="android.intent.category.DEFAULT" />

flags.aconfig

+2 −1

Original line number	Diff line number	Diff line
		@@ -45,10 +45,11 @@ flag {
		}

		flag {
		name: "redirect_get_content"
		name: "redirect_get_content_ro"
		namespace: "documentsui"
		description: "Redirects GET_CONTENT requests to Photopicker when appropriate"
		bug: "377771195"
		is_fixed_read_only: true
		}

		flag {

tests/functional/com/android/documentsui/TrampolineActivityTest.kt

+3 −3

Original line number	Diff line number	Diff line
		@@ -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()