Merge "Update Secure NFC API definitions" (ef371751) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/nfc/SecureNfcPreferenceController.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -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;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);