summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2014-11-20 17:59:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-11-20 17:59:36 +0000
commit14ca22641d7fa624eebdc68554bf2612f2682791 (patch)
tree039be58e98d07fe5ac1b771e167fa23cf533dde8
parent3349df3a5709fcd6eda40f29b8dd52850a265f6f (diff)
parent5d0258c45b65f1051add13d35ff6adc7b6e67697 (diff)
downloadandroid_packages_apps_Nfc-14ca22641d7fa624eebdc68554bf2612f2682791.tar.gz
android_packages_apps_Nfc-14ca22641d7fa624eebdc68554bf2612f2682791.tar.bz2
android_packages_apps_Nfc-14ca22641d7fa624eebdc68554bf2612f2682791.zip
Merge "Add verifyNfcPermission()." into lmp-mr1-dev
-rwxr-xr-xsrc/com/android/nfc/NfcService.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index d7b34866..262d2c1b 100755
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -849,6 +849,11 @@ public class NfcService implements DeviceHostListener {
}
@Override
+ public void verifyNfcPermission() {
+ NfcPermissions.enforceUserPermissions(mContext);
+ }
+
+ @Override
public void invokeBeam() {
NfcPermissions.enforceUserPermissions(mContext);