Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev

am: 9eff3f90d8

Change-Id: I6b27975aa51356f31c2a31c8ee04abc7bb84f2b2
This commit is contained in:
Ruchi Kandoi
2017-08-09 05:38:23 +00:00
committed by android-build-merger

View File

@@ -98,6 +98,7 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener {
// Turn NFC on/off // Turn NFC on/off
final boolean desiredState = (Boolean) value; final boolean desiredState = (Boolean) value;
mSwitch.setChecked(desiredState);
mSwitch.setEnabled(false); mSwitch.setEnabled(false);
if (desiredState) { if (desiredState) {