Merge "Add DEBUG build support for runtime flags/commands..." into nyc-andromeda-dev
diff --git a/src/com/android/documentsui/files/ActionHandler.java b/src/com/android/documentsui/files/ActionHandler.java
index 9a9e05f..c2da8f5 100644
--- a/src/com/android/documentsui/files/ActionHandler.java
+++ b/src/com/android/documentsui/files/ActionHandler.java
@@ -42,6 +42,7 @@
 import com.android.documentsui.base.MimeTypes;
 import com.android.documentsui.ProviderAccess;
 import com.android.documentsui.base.RootInfo;
+import com.android.documentsui.base.Shared;
 import com.android.documentsui.base.State;
 import com.android.documentsui.clipping.ClipStore;
 import com.android.documentsui.clipping.DocumentClipper;
@@ -357,7 +358,9 @@
         }
 
         Intent intent = Intent.createChooser(buildViewIntent(doc), null);
-        intent.putExtra(Intent.EXTRA_AUTO_LAUNCH_SINGLE_CHOICE, false);
+        if (Shared.ENABLE_OMC_API_FEATURES) {
+            intent.putExtra(Intent.EXTRA_AUTO_LAUNCH_SINGLE_CHOICE, false);
+        }
         try {
             mActivity.startActivity(intent);
         } catch (ActivityNotFoundException e) {