PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Secure NFC API definitions

Browse Source 
Bug: 124767797
Test: None
Change-Id: I90f109f08771f429966cd108eaacdf8b81d0a72e
This commit is contained in:
Ruchi Kandoi
2019-03-05 09:53:10 -08:00
parent 68c7aad725
commit d5ba12a94d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/nfc/SecureNfcPreferenceController.java
View File

@@ -52,12 +52,12 @@ public class SecureNfcPreferenceController extends TogglePreferenceController
@Override @Override
public boolean isChecked() { public boolean isChecked() {
return mNfcAdapter.isNfcSecureEnabled(); return mNfcAdapter.isSecureNfcEnabled();
} }
@Override @Override
public boolean setChecked(boolean isChecked) { public boolean setChecked(boolean isChecked) {
return mNfcAdapter.setNfcSecure(isChecked); return mNfcAdapter.enableSecureNfc(isChecked);
} }
@Override @Override
@@ -66,7 +66,7 @@ public class SecureNfcPreferenceController extends TogglePreferenceController
if (mNfcAdapter == null) { if (mNfcAdapter == null) {
return UNSUPPORTED_ON_DEVICE; return UNSUPPORTED_ON_DEVICE;
} }
return mNfcAdapter.deviceSupportsNfcSecure() return mNfcAdapter.isSecureNfcSupported()
? AVAILABLE ? AVAILABLE
: UNSUPPORTED_ON_DEVICE; : UNSUPPORTED_ON_DEVICE;
} }

2
tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java
View File

@@ -80,7 +80,7 @@ public class AdvancedConnectedDeviceDashboardFragmentTest {
Context context = spy(RuntimeEnvironment.application); Context context = spy(RuntimeEnvironment.application);
when(context.getApplicationContext()).thenReturn(context); when(context.getApplicationContext()).thenReturn(context);
when(NfcAdapter.getDefaultAdapter(context)).thenReturn(mNfcAdapter); when(NfcAdapter.getDefaultAdapter(context)).thenReturn(mNfcAdapter);
when(mNfcAdapter.deviceSupportsNfcSecure()).thenReturn(true); when(mNfcAdapter.isSecureNfcSupported()).thenReturn(true);
final List<String> niks = final List<String> niks =
AdvancedConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER AdvancedConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
.getNonIndexableKeys(context); .getNonIndexableKeys(context);