Merge "Add support for FEATURE_NFC_ANDROID_BEAM" am: 6827785e52 am: 39845367ab

am: a7c886925f

Change-Id: I08ff3b1bd80e913aeec9800b1c5ddce69543ba3c

src/com/android/settings/nfc/AndroidBeamPreferenceController.java

@@ -16,6 +16,7 @@
 package com.android.settings.nfc;
 
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.nfc.NfcAdapter;
 
 import androidx.preference.PreferenceScreen;
@@ -54,6 +55,10 @@ public class AndroidBeamPreferenceController extends BasePreferenceController
     @Override
     @AvailabilityStatus
     public int getAvailabilityStatus() {
+        PackageManager pm = mContext.getPackageManager();
+        if (!pm.hasSystemFeature(PackageManager.FEATURE_NFC_BEAM)) {
+                return UNSUPPORTED_ON_DEVICE;
+        }
         return mNfcAdapter != null
                 ? AVAILABLE
                 : UNSUPPORTED_ON_DEVICE;