diff options
| -rw-r--r-- | api/current.txt | 4 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/nfc/NfcAdapter.java | 11 |
3 files changed, 9 insertions, 8 deletions
diff --git a/api/current.txt b/api/current.txt index 56762815af4f..6c4bd1b1de48 100644 --- a/api/current.txt +++ b/api/current.txt @@ -30806,7 +30806,6 @@ package android.nfc { } public final class NfcAdapter { - method public boolean deviceSupportsNfcSecure(); method public void disableForegroundDispatch(android.app.Activity); method @Deprecated public void disableForegroundNdefPush(android.app.Activity); method public void disableReaderMode(android.app.Activity); @@ -30819,7 +30818,8 @@ package android.nfc { method @Deprecated public boolean invokeBeam(android.app.Activity); method public boolean isEnabled(); method @Deprecated public boolean isNdefPushEnabled(); - method public boolean isNfcSecureEnabled(); + method public boolean isSecureNfcEnabled(); + method public boolean isSecureNfcSupported(); method @Deprecated public void setBeamPushUris(android.net.Uri[], android.app.Activity); method @Deprecated public void setBeamPushUrisCallback(android.nfc.NfcAdapter.CreateBeamUrisCallback, android.app.Activity); method @Deprecated public void setNdefPushMessage(android.nfc.NdefMessage, android.app.Activity, android.app.Activity...); diff --git a/api/system-current.txt b/api/system-current.txt index 8b6ba96bf53e..805bfb519798 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5084,9 +5084,9 @@ package android.nfc { method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean disableNdefPush(); method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean enable(); method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean enableNdefPush(); + method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean enableSecureNfc(boolean); method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean removeNfcUnlockHandler(android.nfc.NfcAdapter.NfcUnlockHandler); method public void setNdefPushMessage(android.nfc.NdefMessage, android.app.Activity, int); - method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean setNfcSecure(boolean); field public static final int FLAG_NDEF_PUSH_NO_CONFIRM = 1; // 0x1 } diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java index a7d2ee98b45c..8970c625caa7 100644 --- a/core/java/android/nfc/NfcAdapter.java +++ b/core/java/android/nfc/NfcAdapter.java @@ -1704,11 +1704,12 @@ public final class NfcAdapter { /** * Sets Secure NFC feature. * <p>This API is for the Settings application. + * @return True if successful * @hide */ @SystemApi @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) - public boolean setNfcSecure(boolean enable) { + public boolean enableSecureNfc(boolean enable) { if (!sHasNfcFeature) { throw new UnsupportedOperationException(); } @@ -1726,7 +1727,7 @@ public final class NfcAdapter { * @return True if device supports Secure NFC, false otherwise * @throws UnsupportedOperationException if FEATURE_NFC is unavailable. */ - public boolean deviceSupportsNfcSecure() { + public boolean isSecureNfcSupported() { if (!sHasNfcFeature) { throw new UnsupportedOperationException(); } @@ -1741,12 +1742,12 @@ public final class NfcAdapter { /** * Checks Secure NFC feature is enabled. * - * @return True if device supports Secure NFC is enabled, false otherwise + * @return True if Secure NFC is enabled, false otherwise * @throws UnsupportedOperationException if FEATURE_NFC is unavailable. * @throws UnsupportedOperationException if device doesn't support - * Secure NFC functionality. {@link #deviceSupportsNfcSecure} + * Secure NFC functionality. {@link #isSecureNfcSupported} */ - public boolean isNfcSecureEnabled() { + public boolean isSecureNfcEnabled() { if (!sHasNfcFeature) { throw new UnsupportedOperationException(); } |