commit faa14adf81b18e49102020f035893c9aa71aa867
author Jay Shrauner <shrauner@google.com> Thu Sep 04 05:24:01 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 04 05:24:01 2014 +0000
tree 5e07022a01c6d3333dcfecd6e076e87a44526527
parent b2ace69ba704ac9018d531eb7d0ff89c379380b0
parent bf8b4b97ce5801bf85f94869e9eb449b52d85562

Merge "Clean up activity/application labels" into lmp-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index af2dabc..f35fc0a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -198,24 +198,11 @@
         <activity android:name="com.android.contacts.common.vcard.ImportVCardActivity"
                   android:configChanges="orientation|screenSize|keyboardHidden"
                   android:theme="@style/BackgroundOnlyTheme">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
-                <data android:mimeType="text/directory"/>
-                <data android:mimeType="text/vcard"/>
-                <data android:mimeType="text/x-vcard"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-            </intent-filter>
         </activity>
 
         <activity android:name="com.android.contacts.common.vcard.NfcImportVCardActivity"
                   android:configChanges="orientation|screenSize|keyboardHidden"
                   android:theme="@style/BackgroundOnlyTheme">
-            <intent-filter>
-                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
-                <data android:mimeType="text/vcard"/>
-                <data android:mimeType="text/x-vcard"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-            </intent-filter>
         </activity>
 
         <activity android:name="com.android.contacts.common.vcard.CancelActivity"