Merge "Update Secure NFC API definitions"
diff --git a/src/com/android/settings/nfc/SecureNfcPreferenceController.java b/src/com/android/settings/nfc/SecureNfcPreferenceController.java
index cbff3ea..12dbd57 100644
--- a/src/com/android/settings/nfc/SecureNfcPreferenceController.java
+++ b/src/com/android/settings/nfc/SecureNfcPreferenceController.java
@@ -52,12 +52,12 @@
@Override
public boolean isChecked() {
- return mNfcAdapter.isNfcSecureEnabled();
+ return mNfcAdapter.isSecureNfcEnabled();
}
@Override
public boolean setChecked(boolean isChecked) {
- return mNfcAdapter.setNfcSecure(isChecked);
+ return mNfcAdapter.enableSecureNfc(isChecked);
}
@Override
@@ -66,7 +66,7 @@
if (mNfcAdapter == null) {
return UNSUPPORTED_ON_DEVICE;
}
- return mNfcAdapter.deviceSupportsNfcSecure()
+ return mNfcAdapter.isSecureNfcSupported()
? AVAILABLE
: UNSUPPORTED_ON_DEVICE;
}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java
index 2a8aa8e..3fa0e4d 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java
@@ -80,7 +80,7 @@
Context context = spy(RuntimeEnvironment.application);
when(context.getApplicationContext()).thenReturn(context);
when(NfcAdapter.getDefaultAdapter(context)).thenReturn(mNfcAdapter);
- when(mNfcAdapter.deviceSupportsNfcSecure()).thenReturn(true);
+ when(mNfcAdapter.isSecureNfcSupported()).thenReturn(true);
final List<String> niks =
AdvancedConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
.getNonIndexableKeys(context);