diff --git a/src/com/android/settings/nfc/SecureNfcPreferenceController.java b/src/com/android/settings/nfc/SecureNfcPreferenceController.java
index cbff3eabf7d..12dbd5749ca 100644
--- a/src/com/android/settings/nfc/SecureNfcPreferenceController.java
+++ b/src/com/android/settings/nfc/SecureNfcPreferenceController.java
@@ -52,12 +52,12 @@ public class SecureNfcPreferenceController extends TogglePreferenceController
 
     @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 @@ public class SecureNfcPreferenceController extends TogglePreferenceController
         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 2a8aa8ecdaf..3fa0e4d9aa7 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 @@ public class AdvancedConnectedDeviceDashboardFragmentTest {
         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);