commit a73aa32278adb177042d4b5c873a0f08deb1d3f3
author Martijn Coenen <maco@google.com> Fri Aug 30 12:57:42 2013 -0700
committer Martijn Coenen <maco@google.com> Fri Aug 30 12:57:42 2013 -0700
tree 08fcf9105f11456f6f83c78a4f8710fce68dec16
parent 573a21ada2729346f53acdd2418a77d6911a7374

NFC Tap&Pay: deal with changes from API review.

Also, removed "Ask every time" mode.

Bug: 10550349
Change-Id: If7c300f9f446e3c31d594116ac8e20fb50d9ec3f

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b2e5179..b18b81e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1609,9 +1609,14 @@
                   android:excludeFromRecents="true"
                   android:theme="@*android:style/Theme.Holo.Light.Dialog.Alert">
             <intent-filter>
+                <!-- TODO this filter can be removed -->
                 <action android:name="android.nfc.cardemulation.ACTION_CHANGE_DEFAULT" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.nfc.cardemulation.action.ACTION_CHANGE_DEFAULT" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
         </activity>
 
         <activity android:name="Settings$NotificationAccessSettingsActivity"