diff options
author | Ruchi Kandoi <kandoiruchi@google.com> | 2019-01-04 14:19:23 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-01-04 14:19:23 -0800 |
commit | 8925004b514d7bf3c618c017199aa810ca58e94c (patch) | |
tree | 8833da0514a42e4c4d7dfa84d9204d6495da7d8e /src/com/android/settings/nfc/AndroidBeamPreferenceController.java | |
parent | 5585d5e9d735df4a77c19b337122e37d63450bf8 (diff) | |
parent | a7c886925f4c688321efecc59433fed9b3b73067 (diff) | |
download | packages_apps_Settings-8925004b514d7bf3c618c017199aa810ca58e94c.tar.gz packages_apps_Settings-8925004b514d7bf3c618c017199aa810ca58e94c.tar.bz2 packages_apps_Settings-8925004b514d7bf3c618c017199aa810ca58e94c.zip |
Merge "Add support for FEATURE_NFC_ANDROID_BEAM" am: 6827785e52 am: 39845367ab
am: a7c886925f
Change-Id: I08ff3b1bd80e913aeec9800b1c5ddce69543ba3c
Diffstat (limited to 'src/com/android/settings/nfc/AndroidBeamPreferenceController.java')
-rw-r--r-- | src/com/android/settings/nfc/AndroidBeamPreferenceController.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/settings/nfc/AndroidBeamPreferenceController.java b/src/com/android/settings/nfc/AndroidBeamPreferenceController.java index 181faa5021..b784dc5bc7 100644 --- a/src/com/android/settings/nfc/AndroidBeamPreferenceController.java +++ b/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; |