5 files changed, 12 insertions, 11 deletions
diff --git a/flags.aconfig b/flags.aconfig
index 21fc9567c..1e31323a5 100644
--- a/flags.aconfig
+++ b/flags.aconfig
@@ -10,10 +10,11 @@ flag {
 }
 
 flag {
-    name: "use_search_v2_rw"
+    name: "use_search_v2_read_only"
     namespace: "documentsui"
-    description: "Read/write flag that enables the next generation search functionality."
+    description: "Enables the next generation search functionality."
     bug: "383412640"
+    is_fixed_read_only: true
 }
 
 flag {
diff --git a/src/com/android/documentsui/AbstractActionHandler.java b/src/com/android/documentsui/AbstractActionHandler.java
index de193e235..ba50cfb32 100644
--- a/src/com/android/documentsui/AbstractActionHandler.java
+++ b/src/com/android/documentsui/AbstractActionHandler.java
@@ -20,7 +20,7 @@ import static com.android.documentsui.base.DocumentInfo.getCursorInt;
 import static com.android.documentsui.base.DocumentInfo.getCursorString;
 import static com.android.documentsui.base.SharedMinimal.DEBUG;
 import static com.android.documentsui.util.FlagUtils.isDesktopFileHandlingFlagEnabled;
-import static com.android.documentsui.util.FlagUtils.isUseSearchV2RwFlagEnabled;
+import static com.android.documentsui.util.FlagUtils.isUseSearchV2FlagEnabled;
 
 import android.app.PendingIntent;
 import android.content.ActivityNotFoundException;
@@ -916,7 +916,7 @@ public abstract class AbstractActionHandler<T extends FragmentActivity & CommonA
                 mState.stack.changeRoot(mActivity.getCurrentRoot());
             }
 
-            if (isUseSearchV2RwFlagEnabled()) {
+            if (isUseSearchV2FlagEnabled()) {
                 return onCreateLoaderV2(id, args);
             }
             return onCreateLoaderV1(id, args);
diff --git a/src/com/android/documentsui/util/FlagUtils.kt b/src/com/android/documentsui/util/FlagUtils.kt
index 22febc317..a041dde44 100644
--- a/src/com/android/documentsui/util/FlagUtils.kt
+++ b/src/com/android/documentsui/util/FlagUtils.kt
@@ -35,8 +35,8 @@ class FlagUtils {
         }
 
         @JvmStatic
-        fun isUseSearchV2RwFlagEnabled(): Boolean {
-            return Flags.useSearchV2Rw()
+        fun isUseSearchV2FlagEnabled(): Boolean {
+            return Flags.useSearchV2ReadOnly()
         }
 
         @JvmStatic
diff --git a/tests/unit/com/android/documentsui/loaders/FolderLoaderTest.kt b/tests/unit/com/android/documentsui/loaders/FolderLoaderTest.kt
index 44c410eff..0193ea77d 100644
--- a/tests/unit/com/android/documentsui/loaders/FolderLoaderTest.kt
+++ b/tests/unit/com/android/documentsui/loaders/FolderLoaderTest.kt
@@ -22,7 +22,7 @@ import android.platform.test.flag.junit.DeviceFlagsValueProvider
 import androidx.test.filters.SmallTest
 import com.android.documentsui.ContentLock
 import com.android.documentsui.base.DocumentInfo
-import com.android.documentsui.flags.Flags.FLAG_USE_SEARCH_V2_RW
+import com.android.documentsui.flags.Flags.FLAG_USE_SEARCH_V2_READ_ONLY
 import com.android.documentsui.testing.TestFileTypeLookup
 import com.android.documentsui.testing.TestProvidersAccess
 import java.time.Duration
@@ -59,7 +59,7 @@ class FolderLoaderTest(private val testParams: LoaderTestParams) : BaseLoaderTes
     val checkFlagsRule: CheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule()
 
     @Test
-    @RequiresFlagsEnabled(FLAG_USE_SEARCH_V2_RW)
+    @RequiresFlagsEnabled(FLAG_USE_SEARCH_V2_READ_ONLY)
     fun testLoadInBackground() {
         val mockProvider = mEnv.mockProviders[TestProvidersAccess.DOWNLOADS.authority]
         val docs = createDocuments(TOTAL_FILE_COUNT)
diff --git a/tests/unit/com/android/documentsui/loaders/SearchLoaderTest.kt b/tests/unit/com/android/documentsui/loaders/SearchLoaderTest.kt
index e480337ab..7265af34b 100644
--- a/tests/unit/com/android/documentsui/loaders/SearchLoaderTest.kt
+++ b/tests/unit/com/android/documentsui/loaders/SearchLoaderTest.kt
@@ -24,7 +24,7 @@ import androidx.test.filters.SmallTest
 import com.android.documentsui.ContentLock
 import com.android.documentsui.LockingContentObserver
 import com.android.documentsui.base.DocumentInfo
-import com.android.documentsui.flags.Flags.FLAG_USE_SEARCH_V2_RW
+import com.android.documentsui.flags.Flags.FLAG_USE_SEARCH_V2_READ_ONLY
 import com.android.documentsui.testing.TestFileTypeLookup
 import com.android.documentsui.testing.TestProvidersAccess
 import java.time.Duration
@@ -80,7 +80,7 @@ class SearchLoaderTest(private val testParams: LoaderTestParams) : BaseLoaderTes
     }
 
     @Test
-    @RequiresFlagsEnabled(FLAG_USE_SEARCH_V2_RW)
+    @RequiresFlagsEnabled(FLAG_USE_SEARCH_V2_READ_ONLY)
     fun testLoadInBackground() {
         val mockProvider = mEnv.mockProviders[TestProvidersAccess.DOWNLOADS.authority]
         val docs = createDocuments(TOTAL_FILE_COUNT)
@@ -119,7 +119,7 @@ class SearchLoaderTest(private val testParams: LoaderTestParams) : BaseLoaderTes
     }
 
     @Test
-    @RequiresFlagsEnabled(FLAG_USE_SEARCH_V2_RW)
+    @RequiresFlagsEnabled(FLAG_USE_SEARCH_V2_READ_ONLY)
     @Ignore("b/397095797")
     fun testBlankQueryAndRecency() {
         val userIds = listOf(TestProvidersAccess.DOWNLOADS.userId)