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

am: bf81a17a31 Change-Id: I8ac2a1d903588f27b57b7f5993cb833100436108
2017-08-09 20:35:36 +00:00
parent 35c0949b2e bf81a17a31
commit 706c6ba20e
1 changed files with 1 additions and 0 deletions
--- a/src/com/android/settings/nfc/NfcEnabler.java
+++ b/src/com/android/settings/nfc/NfcEnabler.java
@@ -98,6 +98,7 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener {
        // Turn NFC on/off

        final boolean desiredState = (Boolean) value;
+        mSwitch.setChecked(desiredState);
        mSwitch.setEnabled(false);

        if (desiredState) {