Merge "Default payment settings to disabled" into nyc-dev am: 6b421dd

am: 474cd3c

* commit '474cd3c0621ecd404fc22438ecb83b618880b3a1':
  Default payment settings to disabled

Change-Id: Idc325d493d569411f805b48fc51e6ee55711be8c
This commit is contained in:
Jason Monk
2016-04-28 13:02:52 +00:00
committed by android-build-merger

View File

@@ -2444,7 +2444,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" />