commit 6e5159185388ed97c5b1a8648c1c6f2396d124a2
author Jason Monk <jmonk@google.com> Thu Apr 28 14:51:59 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 28 14:51:59 2016 +0000
tree 1d81325e6f4d8b4d2108bdc40bc4c02664db5b2b
parent f96b5947f9122e471d7cc72847f707bc4dcc30a4
parent 8d8de1490536468bbc1061abca0f78ab0b682b3b

Merge "Fix summary lifecycle" into nyc-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5941aaf..3af57fe 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2441,7 +2441,8 @@
         <activity android:name="Settings$PaymentSettingsActivity"
                 android:label="@string/nfc_payment_settings_title"
                 android:icon="@drawable/ic_settings_nfc_payment"
-                android:taskAffinity="">
+                android:taskAffinity=""
+                android:enabled="false">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NFC_PAYMENT_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />