Merge "Default payment settings to disabled" into nyc-dev

am: 6b421dd

* commit '6b421dd4f6250bceba673d6f86dcb48026517b01':
  Default payment settings to disabled

Change-Id: Id7db30f04e32d212fa1edc719ad0363e468bec67
This commit is contained in:
Jason Monk
2016-04-28 12:59:34 +00:00
committed by android-build-merger

View File

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