From a545774386d84dca5825b503c682a8eab272705c Mon Sep 17 00:00:00 2001
From: Mangesh Ghiware <mghiware@google.com>
Date: Wed, 21 Aug 2013 14:00:34 -0700
Subject: Disable GET_CONTENT intent-filter for KLP+

Bug: 10415790
Change-Id: I94260dbe7c61c1ead2a0e6ea12f837a76a69d547
---
 AndroidManifest.xml | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8f48edf20..d1642f38f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -93,18 +93,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.APP_GALLERY" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.GET_CONTENT" />
-                <category android:name="android.intent.category.OPENABLE" />
-                <data android:mimeType="vnd.android.cursor.dir/image" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.GET_CONTENT" />
-                <category android:name="android.intent.category.OPENABLE" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="image/*" />
-                <data android:mimeType="video/*" />
-            </intent-filter>
             <!-- We do NOT support the PICK intent, we add these intent-filter for
                  backward compatibility. Handle it as GET_CONTENT. -->
             <intent-filter>
@@ -172,6 +160,22 @@
             </intent-filter>
         </activity>
 
+        <!-- This activity alias is added so that GET_CONTENT intent-filter
+             can be disabled for KLP+ builds. -->
+        <activity-alias android:name="com.android.gallery3d.app.GalleryPicker"
+                android:targetActivity="com.android.gallery3d.app.Gallery"
+                android:configChanges="keyboardHidden|orientation|screenSize"
+                android:label="@string/app_name"
+                android:enabled="@bool/atMostJellyBeanMR2">
+            <intent-filter>
+                <action android:name="android.intent.action.GET_CONTENT" />
+                <category android:name="android.intent.category.OPENABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="image/*" />
+                <data android:mimeType="video/*" />
+            </intent-filter>
+        </activity-alias>
+
         <!-- we add this activity-alias for shortcut backward compatibility -->
         <!-- Note: The alias must put after the target activity -->
         <activity-alias android:name="com.cooliris.media.Gallery"
-- 
cgit v1.2.3