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

am: c6d5902

* commit 'c6d59023709b7e86db3b07b5e8b99c34b25f3c29':
  Default payment settings to disabled

Change-Id: I075e3be940e4cfec1582c1d4a928a269327f2431
This commit is contained in:
Jason Monk
2016-04-28 13:02:51 +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" />